diff --git a/website/src/hooks.server.js b/website/src/hooks.server.js
index 165a41ee0..7441e52c7 100644
--- a/website/src/hooks.server.js
+++ b/website/src/hooks.server.js
@@ -1,5 +1,5 @@
 import { base } from '$app/paths';
-import { languages } from '$lib/languages';
+import { languages } from '$lib/i18n/languages';
 import { getURLForLanguage } from '$lib/utils';
 
 export async function handle({ event, resolve }) {
diff --git a/website/src/lib/default-file-name.test.ts b/website/src/lib/actions/default-file-name.test.ts
similarity index 96%
rename from website/src/lib/default-file-name.test.ts
rename to website/src/lib/actions/default-file-name.test.ts
index bae395d44..ad25a2137 100644
--- a/website/src/lib/default-file-name.test.ts
+++ b/website/src/lib/actions/default-file-name.test.ts
@@ -1,6 +1,6 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
-import { defaultFileName } from './default-file-name';
+import { defaultFileName } from '$lib/actions/default-file-name';
 
 describe('default file name', () => {
     it('is the default name when there is no other file with it', () => {
diff --git a/website/src/lib/default-file-name.ts b/website/src/lib/actions/default-file-name.ts
similarity index 100%
rename from website/src/lib/default-file-name.ts
rename to website/src/lib/actions/default-file-name.ts
diff --git a/website/src/lib/logic/file-actions.ts b/website/src/lib/actions/file-actions.ts
similarity index 91%
rename from website/src/lib/logic/file-actions.ts
rename to website/src/lib/actions/file-actions.ts
index 1448b4cc2..1e2ab0773 100644
--- a/website/src/lib/logic/file-actions.ts
+++ b/website/src/lib/actions/file-actions.ts
@@ -1,9 +1,9 @@
 import { currentTool, Tool } from '$lib/components/toolbar/tools';
-import { i18n } from '$lib/i18n.svelte';
+import { i18n } from '$lib/i18n/i18n.svelte';
 import { get } from 'svelte/store';
-import { boundsManager } from './bounds';
+import { boundsManager } from '$lib/state/bounds';
 import { engine } from '$lib/engine';
-import { defaultFileName } from '$lib/default-file-name';
+import { defaultFileName } from '$lib/actions/default-file-name';
 
 /** The name of a new file: the translated default name, numbered if other files have it. */
 export function newFileName() {
diff --git a/website/src/lib/components/AlgoliaDocSearch.svelte b/website/src/lib/components/AlgoliaDocSearch.svelte
index 03bc01fc3..032b15bc8 100644
--- a/website/src/lib/components/AlgoliaDocSearch.svelte
+++ b/website/src/lib/components/AlgoliaDocSearch.svelte
@@ -2,7 +2,7 @@
     import docsearch from '@docsearch/js';
     import '@docsearch/css';
     import { onMount } from 'svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
 
     let props: {
         class?: string;
diff --git a/website/src/lib/components/Footer.svelte b/website/src/lib/components/Footer.svelte
index 6fc62191b..36cb64e07 100644
--- a/website/src/lib/components/Footer.svelte
+++ b/website/src/lib/components/Footer.svelte
@@ -4,7 +4,7 @@
     import ModeSwitch from '$lib/components/ModeSwitch.svelte';
     import Logo from '$lib/components/Logo.svelte';
     import { AtSign, BookOpenText, Heart, House, Map } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { getURLForLanguage } from '$lib/utils';
 </script>
 
diff --git a/website/src/lib/components/GPXStatistics.svelte b/website/src/lib/components/GPXStatistics.svelte
index d86d39230..c8a4e7d50 100644
--- a/website/src/lib/components/GPXStatistics.svelte
+++ b/website/src/lib/components/GPXStatistics.svelte
@@ -5,11 +5,11 @@
 
     import { MoveDownRight, MoveUpRight, Ruler, Timer, Zap } from '@lucide/svelte';
 
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import type { Readable } from 'svelte/store';
     import type { SelectionStatistics } from '$lib/engine';
-    import type { SlicedStatistics } from '$lib/logic/selection-statistics';
-    import { settings } from '$lib/logic/settings';
+    import type { SlicedStatistics } from '$lib/state/selection-statistics';
+    import { settings } from '$lib/state/settings';
 
     const { velocityUnits } = settings;
 
diff --git a/website/src/lib/components/Help.svelte b/website/src/lib/components/Help.svelte
index 80163d2f9..dc0390d1d 100644
--- a/website/src/lib/components/Help.svelte
+++ b/website/src/lib/components/Help.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { CircleQuestionMark } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import type { Snippet } from 'svelte';
 
     let {
diff --git a/website/src/lib/components/LanguageSelect.svelte b/website/src/lib/components/LanguageSelect.svelte
index 0303b6fed..56794bb11 100644
--- a/website/src/lib/components/LanguageSelect.svelte
+++ b/website/src/lib/components/LanguageSelect.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
     import { page } from '$app/state';
     import * as Select from '$lib/components/ui/select';
-    import { languages } from '$lib/languages';
+    import { languages } from '$lib/i18n/languages';
     import { getURLForLanguage } from '$lib/utils';
     import { Languages } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
 </script>
 
 <Select.Root type="single" value={i18n.lang}>
diff --git a/website/src/lib/components/Menu.svelte b/website/src/lib/components/Menu.svelte
index afcfc2d53..0bcbb4f16 100644
--- a/website/src/lib/components/Menu.svelte
+++ b/website/src/lib/components/Menu.svelte
@@ -51,19 +51,19 @@
     import { editStyle } from '$lib/components/file-list/style/utils.svelte';
     import { exportState, ExportState } from '$lib/components/export/utils.svelte';
     import { anySelectedLayer } from '$lib/components/map/layer-control/utils';
-    import { defaultOverlays } from '$lib/assets/layers';
+    import { defaultOverlays } from '$lib/data/layers';
     import LayerControlSettings from '$lib/components/map/layer-control/LayerControlSettings.svelte';
     import Export from '$lib/components/export/Export.svelte';
     import { mode, setMode } from 'mode-watcher';
-    import { i18n } from '$lib/i18n.svelte';
-    import { languages } from '$lib/languages';
+    import { i18n } from '$lib/i18n/i18n.svelte';
+    import { languages } from '$lib/i18n/languages';
     import { getURLForLanguage } from '$lib/utils';
-    import { settings } from '$lib/logic/settings';
-    import { createFile, loadFiles, triggerFileInput } from '$lib/logic/file-actions';
+    import { settings } from '$lib/state/settings';
+    import { createFile, loadFiles, triggerFileInput } from '$lib/actions/file-actions';
     import { engine } from '$lib/engine';
-    import { allHidden } from '$lib/all-hidden';
-    import { selectionSize } from '$lib/selection-helpers';
-    import { boundsManager } from '$lib/logic/bounds';
+    import { allHidden } from '$lib/engine/all-hidden';
+    import { selectionSize } from '$lib/engine/selection-helpers';
+    import { boundsManager } from '$lib/state/bounds';
     import { onMount } from 'svelte';
 
     const {
diff --git a/website/src/lib/components/ModeSwitch.svelte b/website/src/lib/components/ModeSwitch.svelte
index 731477390..d6f94009a 100644
--- a/website/src/lib/components/ModeSwitch.svelte
+++ b/website/src/lib/components/ModeSwitch.svelte
@@ -2,7 +2,7 @@
     import { Button } from '$lib/components/ui/button';
     import { Moon, Sun } from '@lucide/svelte';
     import { mode, setMode } from 'mode-watcher';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
 
     let {
         class: className = '',
diff --git a/website/src/lib/components/Nav.svelte b/website/src/lib/components/Nav.svelte
index a6b0cb772..58b29096b 100644
--- a/website/src/lib/components/Nav.svelte
+++ b/website/src/lib/components/Nav.svelte
@@ -2,7 +2,7 @@
     import Logo from '$lib/components/Logo.svelte';
     import { Button } from '$lib/components/ui/button';
     import { BookOpenText, House, Map } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { getURLForLanguage } from '$lib/utils';
 </script>
 
diff --git a/website/src/lib/components/Shortcut.svelte b/website/src/lib/components/Shortcut.svelte
index ee1357f0d..1fdd5a0c9 100644
--- a/website/src/lib/components/Shortcut.svelte
+++ b/website/src/lib/components/Shortcut.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { isMac, isSafari } from '$lib/utils';
     import { onMount } from 'svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import * as Kbd from '$lib/components/ui/kbd/index.js';
 
     let {
diff --git a/website/src/lib/components/WithUnits.svelte b/website/src/lib/components/WithUnits.svelte
index a140440b2..49957f7f5 100644
--- a/website/src/lib/components/WithUnits.svelte
+++ b/website/src/lib/components/WithUnits.svelte
@@ -8,9 +8,9 @@
         getElevationUnits,
         getVelocityUnits,
         secondsToHHMMSS,
-    } from '$lib/units';
-    import { i18n } from '$lib/i18n.svelte';
-    import { settings } from '$lib/logic/settings';
+    } from '$lib/units/units';
+    import { i18n } from '$lib/i18n/i18n.svelte';
+    import { settings } from '$lib/state/settings';
 
     let {
         value,
diff --git a/website/src/lib/components/docs/guides.test.ts b/website/src/lib/components/docs/guides.test.ts
index d31803e7a..07227ded1 100644
--- a/website/src/lib/components/docs/guides.test.ts
+++ b/website/src/lib/components/docs/guides.test.ts
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { existsSync } from 'node:fs';
 import { describe, it } from 'node:test';
-import { languages } from '$lib/languages';
+import { languages } from '$lib/i18n/languages';
 import { getNextGuide, getPreviousGuide, guides } from './guides';
 
 /** Every page of the help in reading order, as the links at the bottom of the pages follow them. */
diff --git a/website/src/lib/components/elevation-profile/ElevationProfile.svelte b/website/src/lib/components/elevation-profile/ElevationProfile.svelte
index 674844e7b..c1c1dd32a 100644
--- a/website/src/lib/components/elevation-profile/ElevationProfile.svelte
+++ b/website/src/lib/components/elevation-profile/ElevationProfile.svelte
@@ -18,11 +18,11 @@
         Construction,
     } from '@lucide/svelte';
     import type { Readable, Writable } from 'svelte/store';
-    import type { Coordinates } from '$lib/geo';
+    import type { Coordinates } from '$lib/geo/coordinates';
     import type { SelectionStatistics } from '$lib/engine';
-    import type { SlicedStatistics } from '$lib/logic/selection-statistics';
-    import { settings } from '$lib/logic/settings';
-    import { i18n } from '$lib/i18n.svelte';
+    import type { SlicedStatistics } from '$lib/state/selection-statistics';
+    import { settings } from '$lib/state/settings';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { ElevationProfile } from '$lib/components/elevation-profile/elevation-profile';
 
     const { velocityUnits } = settings;
diff --git a/website/src/lib/components/elevation-profile/elevation-profile.ts b/website/src/lib/components/elevation-profile/elevation-profile.ts
index bf1a63eb3..0dbff0e1a 100644
--- a/website/src/lib/components/elevation-profile/elevation-profile.ts
+++ b/website/src/lib/components/elevation-profile/elevation-profile.ts
@@ -1,5 +1,5 @@
-import { i18n } from '$lib/i18n.svelte';
-import { settings } from '$lib/logic/settings';
+import { i18n } from '$lib/i18n/i18n.svelte';
+import { settings } from '$lib/state/settings';
 import {
     getCadenceWithUnits,
     getConvertedDistance,
@@ -13,7 +13,7 @@ import {
     getPowerWithUnits,
     getTemperatureWithUnits,
     getVelocityWithUnits,
-} from '$lib/units';
+} from '$lib/units/units';
 import Chart, {
     type ChartEvent,
     type ChartOptions,
@@ -21,7 +21,7 @@ import Chart, {
     type TooltipItem,
 } from 'chart.js/auto';
 import { get, type Readable, type Writable } from 'svelte/store';
-import type { Coordinates } from '$lib/geo';
+import type { Coordinates } from '$lib/geo/coordinates';
 import {
     engine,
     NO_TIME,
@@ -29,10 +29,10 @@ import {
     type StatisticsMetric,
     type StatisticsRequest,
 } from '$lib/engine';
-import type { SlicedStatistics } from '$lib/logic/selection-statistics';
+import type { SlicedStatistics } from '$lib/state/selection-statistics';
 import { mode } from 'mode-watcher';
-import { categoryValues } from '$lib/trackpoint-categories';
-import { getHighwayColor, getSlopeColor, getSurfaceColor } from '$lib/assets/colors';
+import { categoryValues } from '$lib/engine/trackpoint-categories';
+import { getHighwayColor, getSlopeColor, getSurfaceColor } from '$lib/data/colors';
 
 const { distanceUnits, velocityUnits, temperatureUnits } = settings;
 
diff --git a/website/src/lib/components/embedding/Embedding.svelte b/website/src/lib/components/embedding/Embedding.svelte
index b91000579..c73561db9 100644
--- a/website/src/lib/components/embedding/Embedding.svelte
+++ b/website/src/lib/components/embedding/Embedding.svelte
@@ -13,12 +13,12 @@
         type EmbeddingOptions,
     } from './embedding';
     import { setMode } from 'mode-watcher';
-    import { settings } from '$lib/logic/settings';
-    import { loadFiles } from '$lib/logic/file-actions';
+    import { settings } from '$lib/state/settings';
+    import { loadFiles } from '$lib/actions/file-actions';
     import { untrack } from 'svelte';
     import { isSelected, toggle } from '$lib/components/map/layer-control/utils';
     import { engine } from '$lib/engine';
-    import { hoveredPoint, slicedStatistics } from '$lib/logic/selection-statistics';
+    import { hoveredPoint, slicedStatistics } from '$lib/state/selection-statistics';
 
     let {
         useHash = true,
diff --git a/website/src/lib/components/embedding/EmbeddingPlayground.svelte b/website/src/lib/components/embedding/EmbeddingPlayground.svelte
index b4088e225..14adda0f7 100644
--- a/website/src/lib/components/embedding/EmbeddingPlayground.svelte
+++ b/website/src/lib/components/embedding/EmbeddingPlayground.svelte
@@ -15,7 +15,7 @@
         Milestone,
         Video,
     } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import {
         allowedEmbeddingBasemaps,
         defaultEmbeddingOptions,
diff --git a/website/src/lib/components/embedding/OpenIn.svelte b/website/src/lib/components/embedding/OpenIn.svelte
index 041e4dd9e..11bcae6f7 100644
--- a/website/src/lib/components/embedding/OpenIn.svelte
+++ b/website/src/lib/components/embedding/OpenIn.svelte
@@ -2,7 +2,7 @@
     import { Button } from '$lib/components/ui/button';
     import Logo from '$lib/components/Logo.svelte';
     import { getURLForLanguage } from '$lib/utils';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
 
     let {
         files,
diff --git a/website/src/lib/components/embedding/embedding.ts b/website/src/lib/components/embedding/embedding.ts
index 1bb29550d..ed783266a 100644
--- a/website/src/lib/components/embedding/embedding.ts
+++ b/website/src/lib/components/embedding/embedding.ts
@@ -1,5 +1,5 @@
 import { PUBLIC_MAPTILER_KEY } from '$env/static/public';
-import { basemaps } from '$lib/assets/layers';
+import { basemaps } from '$lib/data/layers';
 
 export type EmbeddingOptions = {
     key: string;
diff --git a/website/src/lib/components/export/Export.svelte b/website/src/lib/components/export/Export.svelte
index ef0c0c889..65dd8589b 100644
--- a/website/src/lib/components/export/Export.svelte
+++ b/website/src/lib/components/export/Export.svelte
@@ -23,7 +23,7 @@
         SquareActivity,
         Route,
     } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { engine, type ExportOptions } from '$lib/engine';
 
     const selection = engine.selection;
diff --git a/website/src/lib/components/file-list/FileList.svelte b/website/src/lib/components/file-list/FileList.svelte
index 1d50b415c..96a6dd2d6 100644
--- a/website/src/lib/components/file-list/FileList.svelte
+++ b/website/src/lib/components/file-list/FileList.svelte
@@ -5,10 +5,10 @@
     import { onMount, setContext } from 'svelte';
     import { ClipboardPaste, FileStack, Plus } from '@lucide/svelte';
     import Shortcut from '$lib/components/Shortcut.svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { engine } from '$lib/engine';
-    import { selectedFileIds } from '$lib/selection-helpers';
-    import { createFile } from '$lib/logic/file-actions';
+    import { selectedFileIds } from '$lib/engine/selection-helpers';
+    import { createFile } from '$lib/actions/file-actions';
 
     let {
         orientation,
diff --git a/website/src/lib/components/file-list/FileListNode.svelte b/website/src/lib/components/file-list/FileListNode.svelte
index 31c96b02b..9fb4a03a5 100644
--- a/website/src/lib/components/file-list/FileListNode.svelte
+++ b/website/src/lib/components/file-list/FileListNode.svelte
@@ -3,15 +3,15 @@
     import FileListNodeContent from './FileListNodeContent.svelte';
     import FileListNodeLabel from './FileListNodeLabel.svelte';
     import { getContext } from 'svelte';
-    import { i18n } from '$lib/i18n.svelte';
-    import { settings } from '$lib/logic/settings';
+    import { i18n } from '$lib/i18n/i18n.svelte';
+    import { settings } from '$lib/state/settings';
     import { engine, type FileState } from '$lib/engine';
     import {
         elementId,
         hasSelectionWithin,
         isSelected,
         type FileTreeNode,
-    } from '$lib/selection-helpers';
+    } from '$lib/engine/selection-helpers';
 
     let {
         fileState,
diff --git a/website/src/lib/components/file-list/FileListNodeContent.svelte b/website/src/lib/components/file-list/FileListNodeContent.svelte
index 0c1cafc7e..73b58d2a5 100644
--- a/website/src/lib/components/file-list/FileListNodeContent.svelte
+++ b/website/src/lib/components/file-list/FileListNodeContent.svelte
@@ -5,7 +5,7 @@
     import FileListNodeContent from './FileListNodeContent.svelte';
     import { allowedMoves, dragging, SortableFileList, type ListLevel } from './sortable-file-list';
     import { engine, type FileState } from '$lib/engine';
-    import type { FileTreeNode } from '$lib/selection-helpers';
+    import type { FileTreeNode } from '$lib/engine/selection-helpers';
 
     let {
         fileState,
diff --git a/website/src/lib/components/file-list/FileListNodeLabel.svelte b/website/src/lib/components/file-list/FileListNodeLabel.svelte
index 04e4fb194..ad570243e 100644
--- a/website/src/lib/components/file-list/FileListNodeLabel.svelte
+++ b/website/src/lib/components/file-list/FileListNodeLabel.svelte
@@ -19,16 +19,16 @@
         FileStack,
     } from '@lucide/svelte';
     import { getContext } from 'svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import MetadataDialog from '$lib/components/file-list/metadata/MetadataDialog.svelte';
     import { editMetadata } from '$lib/components/file-list/metadata/utils.svelte';
     import StyleDialog from '$lib/components/file-list/style/StyleDialog.svelte';
     import { editStyle } from '$lib/components/file-list/style/utils.svelte';
-    import { getSymbolKey, symbols } from '$lib/assets/symbols';
+    import { getSymbolKey, symbols } from '$lib/data/symbols';
     import { engine, type FileState } from '$lib/engine';
-    import { allHidden } from '$lib/all-hidden';
-    import { normalizeColor } from '$lib/file-colors';
-    import { isHidden } from '$lib/file-visibility';
+    import { allHidden } from '$lib/engine/all-hidden';
+    import { normalizeColor } from '$lib/engine/file-colors';
+    import { isHidden } from '$lib/engine/file-visibility';
     import {
         elementId,
         isInClipboard,
@@ -36,8 +36,8 @@
         selectedElementIds,
         selectionSize,
         type FileTreeNode,
-    } from '$lib/selection-helpers';
-    import { boundsManager } from '$lib/logic/bounds';
+    } from '$lib/engine/selection-helpers';
+    import { boundsManager } from '$lib/state/bounds';
     import { waypointPopup } from '$lib/components/map/gpx-layer/gpx-layer-popup';
 
     let {
diff --git a/website/src/lib/components/file-list/metadata/MetadataDialog.svelte b/website/src/lib/components/file-list/metadata/MetadataDialog.svelte
index e9b11ca5a..df4bc0ead 100644
--- a/website/src/lib/components/file-list/metadata/MetadataDialog.svelte
+++ b/website/src/lib/components/file-list/metadata/MetadataDialog.svelte
@@ -5,10 +5,10 @@
     import { Label } from '$lib/components/ui/label/index.js';
     import * as Popover from '$lib/components/ui/popover';
     import { Save } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { editMetadata } from '$lib/components/file-list/metadata/utils.svelte';
     import { engine, type FileState } from '$lib/engine';
-    import type { FileTreeNode } from '$lib/selection-helpers';
+    import type { FileTreeNode } from '$lib/engine/selection-helpers';
 
     let {
         fileState,
diff --git a/website/src/lib/components/file-list/sortable-file-list.ts b/website/src/lib/components/file-list/sortable-file-list.ts
index cd4a247aa..764d9a042 100644
--- a/website/src/lib/components/file-list/sortable-file-list.ts
+++ b/website/src/lib/components/file-list/sortable-file-list.ts
@@ -3,7 +3,7 @@ import Sortable, { type Direction } from 'sortablejs/Sortable';
 import { get, writable } from 'svelte/store';
 import { tick } from 'svelte';
 import { engine, type MoveTarget, type Selection } from '$lib/engine';
-import { isSelected, type FileTreeNode } from '$lib/selection-helpers';
+import { isSelected, type FileTreeNode } from '$lib/engine/selection-helpers';
 
 /** What a list holds: the files, the tracks of a file, the segments of a track, or the waypoints. */
 export type ListLevel = 'file' | 'track' | 'segment' | 'waypoints' | 'waypoint';
diff --git a/website/src/lib/components/file-list/style/StyleDialog.svelte b/website/src/lib/components/file-list/style/StyleDialog.svelte
index 89866be0d..d9d50337e 100644
--- a/website/src/lib/components/file-list/style/StyleDialog.svelte
+++ b/website/src/lib/components/file-list/style/StyleDialog.svelte
@@ -6,11 +6,11 @@
     import * as Popover from '$lib/components/ui/popover';
     import { Save } from '@lucide/svelte';
     import { editStyle } from '$lib/components/file-list/style/utils.svelte';
-    import { i18n } from '$lib/i18n.svelte';
-    import { settings } from '$lib/logic/settings';
+    import { i18n } from '$lib/i18n/i18n.svelte';
+    import { settings } from '$lib/state/settings';
     import { engine, type FileState } from '$lib/engine';
-    import { normalizeColor } from '$lib/file-colors';
-    import { selectedFileIds, type FileTreeNode } from '$lib/selection-helpers';
+    import { normalizeColor } from '$lib/engine/file-colors';
+    import { selectedFileIds, type FileTreeNode } from '$lib/engine/selection-helpers';
     import { untrack } from 'svelte';
 
     let {
diff --git a/website/src/lib/components/map/Map.svelte b/website/src/lib/components/map/Map.svelte
index 9b5d539db..f3e5aae3f 100644
--- a/website/src/lib/components/map/Map.svelte
+++ b/website/src/lib/components/map/Map.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { onDestroy, onMount } from 'svelte';
     import { Button } from '$lib/components/ui/button';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { page } from '$app/state';
     import { map } from '$lib/components/map/map';
     import { PUBLIC_MAPTILER_KEY } from '$env/static/public';
diff --git a/website/src/lib/components/map/gpx-layer/CopyCoordinates.svelte b/website/src/lib/components/map/gpx-layer/CopyCoordinates.svelte
index 1504c89a3..913974f71 100644
--- a/website/src/lib/components/map/gpx-layer/CopyCoordinates.svelte
+++ b/website/src/lib/components/map/gpx-layer/CopyCoordinates.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Button } from '$lib/components/ui/button';
     import { ClipboardCopy } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
 
     let {
         coordinates,
diff --git a/website/src/lib/components/map/gpx-layer/TrackpointPopup.svelte b/website/src/lib/components/map/gpx-layer/TrackpointPopup.svelte
index f556ac8a8..c69332505 100644
--- a/website/src/lib/components/map/gpx-layer/TrackpointPopup.svelte
+++ b/website/src/lib/components/map/gpx-layer/TrackpointPopup.svelte
@@ -4,12 +4,16 @@
     import * as Card from '$lib/components/ui/card';
     import WithUnits from '$lib/components/WithUnits.svelte';
     import { Compass, Earth, Mountain, Timer } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import type { PopupItem } from '$lib/components/map/map-popup';
     import type { TrackpointDetails } from '$lib/engine';
     import { map } from '$lib/components/map/map';
 
-    let { trackpoint }: { trackpoint: PopupItem<Pick<TrackpointDetails, 'lng' | 'lat'> & Partial<TrackpointDetails>> } = $props();
+    let {
+        trackpoint,
+    }: {
+        trackpoint: PopupItem<Pick<TrackpointDetails, 'lng' | 'lat'> & Partial<TrackpointDetails>>;
+    } = $props();
 </script>
 
 <Card.Root class="border-none shadow-md text-base p-2">
diff --git a/website/src/lib/components/map/gpx-layer/WaypointPopup.svelte b/website/src/lib/components/map/gpx-layer/WaypointPopup.svelte
index 1319fafab..015c5d016 100644
--- a/website/src/lib/components/map/gpx-layer/WaypointPopup.svelte
+++ b/website/src/lib/components/map/gpx-layer/WaypointPopup.svelte
@@ -6,13 +6,13 @@
     import WithUnits from '$lib/components/WithUnits.svelte';
     import { Dot, ExternalLink, Trash2 } from '@lucide/svelte';
     import { currentTool, Tool } from '$lib/components/toolbar/tools';
-    import { getSymbolKey, symbols } from '$lib/assets/symbols';
-    import { i18n } from '$lib/i18n.svelte';
+    import { getSymbolKey, symbols } from '$lib/data/symbols';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import sanitizeHtml from 'sanitize-html';
     import { ScrollArea } from '$lib/components/ui/scroll-area/index.js';
     import type { PopupItem } from '$lib/components/map/map-popup';
     import { engine, type WaypointDetails } from '$lib/engine';
-    import { hasSelectionWithin } from '$lib/selection-helpers';
+    import { hasSelectionWithin } from '$lib/engine/selection-helpers';
 
     let {
         waypoint,
diff --git a/website/src/lib/components/map/gpx-layer/distance-markers.ts b/website/src/lib/components/map/gpx-layer/distance-markers.ts
index 33b7eb838..75f72a32e 100644
--- a/website/src/lib/components/map/gpx-layer/distance-markers.ts
+++ b/website/src/lib/components/map/gpx-layer/distance-markers.ts
@@ -1,9 +1,9 @@
-import { settings } from '$lib/logic/settings';
+import { settings } from '$lib/state/settings';
 import { engine } from '$lib/engine';
-import { getConvertedDistanceToKilometers } from '$lib/units';
+import { getConvertedDistanceToKilometers } from '$lib/units/units';
 import { get } from 'svelte/store';
 import { map } from '$lib/components/map/map';
-import { allHidden } from '$lib/all-hidden';
+import { allHidden } from '$lib/engine/all-hidden';
 import type { GeoJSONSource } from 'maplibre-gl';
 import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
 
diff --git a/website/src/lib/components/map/gpx-layer/gpx-layer.ts b/website/src/lib/components/map/gpx-layer/gpx-layer.ts
index 5f4dd1ec6..9937c6909 100644
--- a/website/src/lib/components/map/gpx-layer/gpx-layer.ts
+++ b/website/src/lib/components/map/gpx-layer/gpx-layer.ts
@@ -7,18 +7,18 @@ import maplibregl, {
 } from 'maplibre-gl';
 import { map } from '$lib/components/map/map';
 import { waypointPopup, trackpointPopup } from './gpx-layer-popup';
-import { closestPointIndex } from '$lib/closest-point';
+import { closestPointIndex } from '$lib/geo/closest-point';
 import { getElevation, loadSVGIcon } from '$lib/utils';
 import { selectedWaypoint } from '$lib/components/toolbar/tools/waypoint/waypoint';
 import { MapPin, Square } from 'lucide-static';
-import { getSymbolKey, symbols } from '$lib/assets/symbols';
+import { getSymbolKey, symbols } from '$lib/data/symbols';
 import { engine, type FileState, type Selection } from '$lib/engine';
-import { isCovered, hasSelectionWithin, type FileTreeNode } from '$lib/selection-helpers';
-import { isSegmentHidden, isWaypointHidden } from '$lib/file-visibility';
-import { settings } from '$lib/logic/settings';
+import { isCovered, hasSelectionWithin, type FileTreeNode } from '$lib/engine/selection-helpers';
+import { isSegmentHidden, isWaypointHidden } from '$lib/engine/file-visibility';
+import { settings } from '$lib/state/settings';
 import { currentTool, Tool } from '$lib/components/toolbar/tools';
 import { splitAtPoint } from '$lib/components/toolbar/tools/scissors/scissors';
-import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
+import { mapCursor, MapCursorState } from '$lib/state/map-cursor';
 import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
 
 export function getSvgForSymbol(symbol?: string | undefined, layerColor?: string | undefined) {
diff --git a/website/src/lib/components/map/gpx-layer/start-end-markers.ts b/website/src/lib/components/map/gpx-layer/start-end-markers.ts
index b8db0d58c..7b16914ce 100644
--- a/website/src/lib/components/map/gpx-layer/start-end-markers.ts
+++ b/website/src/lib/components/map/gpx-layer/start-end-markers.ts
@@ -2,10 +2,10 @@ import { currentTool, Tool } from '$lib/components/toolbar/tools';
 import type { GeoJSONSource } from 'maplibre-gl';
 import { get } from 'svelte/store';
 import { map } from '$lib/components/map/map';
-import { allHidden } from '$lib/all-hidden';
+import { allHidden } from '$lib/engine/all-hidden';
 import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
 import { loadSVGIcon } from '$lib/utils';
-import { hoveredPoint, slicedStatistics } from '$lib/logic/selection-statistics';
+import { hoveredPoint, slicedStatistics } from '$lib/state/selection-statistics';
 import { engine } from '$lib/engine';
 
 const startMarkerSVG = `<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
diff --git a/website/src/lib/components/map/layer-control/CustomLayers.svelte b/website/src/lib/components/map/layer-control/CustomLayers.svelte
index 6f7a94f2b..5d557c6a9 100644
--- a/website/src/lib/components/map/layer-control/CustomLayers.svelte
+++ b/website/src/lib/components/map/layer-control/CustomLayers.svelte
@@ -17,11 +17,11 @@
         Map,
         Layers2,
     } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
-    import { defaultBasemap, type CustomLayer } from '$lib/assets/layers';
+    import { i18n } from '$lib/i18n/i18n.svelte';
+    import { defaultBasemap, type CustomLayer } from '$lib/data/layers';
     import { onMount } from 'svelte';
     import { remove } from './utils';
-    import { settings } from '$lib/logic/settings';
+    import { settings } from '$lib/state/settings';
     import { dndzone } from 'svelte-dnd-action';
 
     const {
diff --git a/website/src/lib/components/map/layer-control/LayerControl.svelte b/website/src/lib/components/map/layer-control/LayerControl.svelte
index e91dec96f..233389142 100644
--- a/website/src/lib/components/map/layer-control/LayerControl.svelte
+++ b/website/src/lib/components/map/layer-control/LayerControl.svelte
@@ -5,7 +5,7 @@
     import { Separator } from '$lib/components/ui/separator';
     import { ScrollArea } from '$lib/components/ui/scroll-area/index.js';
     import { Layers } from '@lucide/svelte';
-    import { settings } from '$lib/logic/settings';
+    import { settings } from '$lib/state/settings';
     import { map } from '$lib/components/map/map';
 
     let container: HTMLDivElement;
diff --git a/website/src/lib/components/map/layer-control/LayerControlSettings.svelte b/website/src/lib/components/map/layer-control/LayerControlSettings.svelte
index 71d61a8be..f2584919b 100644
--- a/website/src/lib/components/map/layer-control/LayerControlSettings.svelte
+++ b/website/src/lib/components/map/layer-control/LayerControlSettings.svelte
@@ -14,12 +14,12 @@
         overlayTree,
         overpassTree,
         terrainSources,
-    } from '$lib/assets/layers';
+    } from '$lib/data/layers';
     import { getLayers, isSelected, toggle } from '$lib/components/map/layer-control/utils';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { map } from '$lib/components/map/map';
     import CustomLayers from './CustomLayers.svelte';
-    import { settings } from '$lib/logic/settings';
+    import { settings } from '$lib/state/settings';
     import { untrack } from 'svelte';
     import { extensionAPI } from '$lib/components/map/layer-control/extension-api';
 
diff --git a/website/src/lib/components/map/layer-control/LayerTree.svelte b/website/src/lib/components/map/layer-control/LayerTree.svelte
index f1f6f3ea7..8fb07b8c5 100644
--- a/website/src/lib/components/map/layer-control/LayerTree.svelte
+++ b/website/src/lib/components/map/layer-control/LayerTree.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import LayerTreeNode from './LayerTreeNode.svelte';
-    import { type LayerTreeType } from '$lib/assets/layers';
+    import { type LayerTreeType } from '$lib/data/layers';
     import CollapsibleTree from '$lib/components/collapsible-tree/CollapsibleTree.svelte';
 
     let {
diff --git a/website/src/lib/components/map/layer-control/LayerTreeNode.svelte b/website/src/lib/components/map/layer-control/LayerTreeNode.svelte
index 422e8f1bd..52bf2732a 100644
--- a/website/src/lib/components/map/layer-control/LayerTreeNode.svelte
+++ b/website/src/lib/components/map/layer-control/LayerTreeNode.svelte
@@ -3,10 +3,10 @@
     import { Label } from '$lib/components/ui/label';
     import { Checkbox } from '$lib/components/ui/checkbox';
     import CollapsibleTreeNode from '$lib/components/collapsible-tree/CollapsibleTreeNode.svelte';
-    import { type LayerTreeType } from '$lib/assets/layers';
+    import { type LayerTreeType } from '$lib/data/layers';
     import { anySelectedLayer } from './utils';
-    import { i18n } from '$lib/i18n.svelte';
-    import { settings } from '$lib/logic/settings';
+    import { i18n } from '$lib/i18n/i18n.svelte';
+    import { settings } from '$lib/state/settings';
     import { extensionAPI } from '$lib/components/map/layer-control/extension-api';
 
     let {
diff --git a/website/src/lib/components/map/layer-control/OverpassPopup.svelte b/website/src/lib/components/map/layer-control/OverpassPopup.svelte
index f1d8c443e..716c7a6a0 100644
--- a/website/src/lib/components/map/layer-control/OverpassPopup.svelte
+++ b/website/src/lib/components/map/layer-control/OverpassPopup.svelte
@@ -2,11 +2,11 @@
     import * as Card from '$lib/components/ui/card';
     import { Button } from '$lib/components/ui/button';
     import { PencilLine, MapPin } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { ScrollArea } from '$lib/components/ui/scroll-area/index.js';
     import type { PopupItem } from '$lib/components/map/map-popup';
     import { engine } from '$lib/engine';
-    import { selectionSize } from '$lib/selection-helpers';
+    import { selectionSize } from '$lib/engine/selection-helpers';
     import { getElevation } from '$lib/utils';
 
     let {
diff --git a/website/src/lib/components/map/layer-control/extension-api.test.ts b/website/src/lib/components/map/layer-control/extension-api.test.ts
index 87550b24f..cf51c0b2e 100644
--- a/website/src/lib/components/map/layer-control/extension-api.test.ts
+++ b/website/src/lib/components/map/layer-control/extension-api.test.ts
@@ -2,9 +2,9 @@
 import assert from 'node:assert/strict';
 import { afterEach, beforeEach, describe, it } from 'node:test';
 import { get } from 'svelte/store';
-import { overlays, overlayTree, type LayerTreeType } from '$lib/assets/layers';
+import { overlays, overlayTree, type LayerTreeType } from '$lib/data/layers';
 import { engine } from '$lib/engine';
-import { settings } from '$lib/logic/settings';
+import { settings } from '$lib/state/settings';
 import { ExtensionAPI, type CustomOverlay } from './extension-api';
 import { isSelected } from './utils';
 
diff --git a/website/src/lib/components/map/layer-control/extension-api.ts b/website/src/lib/components/map/layer-control/extension-api.ts
index e87403438..f567ea10f 100644
--- a/website/src/lib/components/map/layer-control/extension-api.ts
+++ b/website/src/lib/components/map/layer-control/extension-api.ts
@@ -1,7 +1,7 @@
-import { settings } from '$lib/logic/settings';
+import { settings } from '$lib/state/settings';
 import { derived, get, writable, type Writable } from 'svelte/store';
 import { isSelected, remove, removeAll } from './utils';
-import { overlays, overlayTree } from '$lib/assets/layers';
+import { overlays, overlayTree } from '$lib/data/layers';
 import { browser } from '$app/environment';
 import { map } from '$lib/components/map/map';
 
diff --git a/website/src/lib/components/map/layer-control/overpass-layer.ts b/website/src/lib/components/map/layer-control/overpass-layer.ts
index 2cf634c64..bed86b439 100644
--- a/website/src/lib/components/map/layer-control/overpass-layer.ts
+++ b/website/src/lib/components/map/layer-control/overpass-layer.ts
@@ -1,14 +1,14 @@
 import { SphericalMercator } from '@mapbox/sphericalmercator';
 import { getLayers } from './utils';
 import { get, writable } from 'svelte/store';
-import { overpassQueryData } from '$lib/assets/layers';
+import { overpassQueryData } from '$lib/data/layers';
 import { MapPopup } from '$lib/components/map/map-popup';
-import { settings } from '$lib/logic/settings';
+import { settings } from '$lib/state/settings';
 import type { GeoJSONSource } from 'maplibre-gl';
 import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
 import type { MapLayerEventManager } from '$lib/components/map/map-layer-event-manager';
 import { loadSVGIcon } from '$lib/utils';
-import { cachedFetch } from '$lib/cached-fetch';
+import { cachedFetch } from '$lib/storage/cached-fetch';
 
 const { currentOverpassQueries } = settings;
 
diff --git a/website/src/lib/components/map/layer-control/utils.test.ts b/website/src/lib/components/map/layer-control/utils.test.ts
index 4e24c4280..ca3b791a2 100644
--- a/website/src/lib/components/map/layer-control/utils.test.ts
+++ b/website/src/lib/components/map/layer-control/utils.test.ts
@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import type { LayerTreeType } from '$lib/assets/layers';
+import type { LayerTreeType } from '$lib/data/layers';
 import { anySelectedLayer, getLayers, isSelected, remove, removeAll, toggle } from './utils';
 
 // roads: bike (selected), foot
diff --git a/website/src/lib/components/map/layer-control/utils.ts b/website/src/lib/components/map/layer-control/utils.ts
index 901c0d3c0..422a49b5e 100644
--- a/website/src/lib/components/map/layer-control/utils.ts
+++ b/website/src/lib/components/map/layer-control/utils.ts
@@ -1,4 +1,4 @@
-import type { LayerTreeType } from '$lib/assets/layers';
+import type { LayerTreeType } from '$lib/data/layers';
 
 export function anySelectedLayer(node: LayerTreeType) {
     return (
diff --git a/website/src/lib/components/map/map.ts b/website/src/lib/components/map/map.ts
index 7870b3ba9..3c3423e8e 100644
--- a/website/src/lib/components/map/map.ts
+++ b/website/src/lib/components/map/map.ts
@@ -5,7 +5,7 @@ import MaplibreGeocoder, {
 } from '@maplibre/maplibre-gl-geocoder';
 import '@maplibre/maplibre-gl-geocoder/dist/maplibre-gl-geocoder.css';
 import { get, writable, type Writable } from 'svelte/store';
-import { settings } from '$lib/logic/settings';
+import { settings } from '$lib/state/settings';
 import { tick } from 'svelte';
 import { ANCHOR_LAYER_KEY, StyleManager } from '$lib/components/map/style';
 import { MapLayerEventManager } from '$lib/components/map/map-layer-event-manager';
diff --git a/website/src/lib/components/map/street-view-control/StreetViewControl.svelte b/website/src/lib/components/map/street-view-control/StreetViewControl.svelte
index 7e8a2edd3..6884f850a 100644
--- a/website/src/lib/components/map/street-view-control/StreetViewControl.svelte
+++ b/website/src/lib/components/map/street-view-control/StreetViewControl.svelte
@@ -5,8 +5,8 @@
     import { PersonStanding, X } from '@lucide/svelte';
     import { MapillaryLayer } from './mapillary';
     import { GoogleRedirect } from './google';
-    import { settings } from '$lib/logic/settings';
-    import { i18n } from '$lib/i18n.svelte';
+    import { settings } from '$lib/state/settings';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { onMount } from 'svelte';
     import ButtonWithTooltip from '$lib/components/ButtonWithTooltip.svelte';
 
diff --git a/website/src/lib/components/map/street-view-control/google.ts b/website/src/lib/components/map/street-view-control/google.ts
index 2d93a15cd..9d4c73b34 100644
--- a/website/src/lib/components/map/street-view-control/google.ts
+++ b/website/src/lib/components/map/street-view-control/google.ts
@@ -1,4 +1,4 @@
-import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
+import { mapCursor, MapCursorState } from '$lib/state/map-cursor';
 
 export class GoogleRedirect {
     map: maplibregl.Map;
diff --git a/website/src/lib/components/map/street-view-control/mapillary.ts b/website/src/lib/components/map/street-view-control/mapillary.ts
index 266bd9608..a19d9688b 100644
--- a/website/src/lib/components/map/street-view-control/mapillary.ts
+++ b/website/src/lib/components/map/street-view-control/mapillary.ts
@@ -1,7 +1,7 @@
 import maplibregl, { type LayerSpecification, type VectorSourceSpecification } from 'maplibre-gl';
 import { Viewer, type ViewerBearingEvent } from 'mapillary-js/dist/mapillary.module';
 import 'mapillary-js/dist/mapillary.css';
-import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
+import { mapCursor, MapCursorState } from '$lib/state/map-cursor';
 import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
 import type { MapLayerEventManager } from '$lib/components/map/map-layer-event-manager';
 
diff --git a/website/src/lib/components/map/style.ts b/website/src/lib/components/map/style.ts
index 1852019ae..bc8228b22 100644
--- a/website/src/lib/components/map/style.ts
+++ b/website/src/lib/components/map/style.ts
@@ -1,4 +1,4 @@
-import { settings } from '$lib/logic/settings';
+import { settings } from '$lib/state/settings';
 import { get, type Writable } from 'svelte/store';
 import {
     basemaps,
@@ -6,9 +6,9 @@ import {
     maptilerKeyPlaceHolder,
     overlays,
     terrainSources,
-} from '$lib/assets/layers';
+} from '$lib/data/layers';
 import { getLayers } from '$lib/components/map/layer-control/utils';
-import { i18n } from '$lib/i18n.svelte';
+import { i18n } from '$lib/i18n/i18n.svelte';
 
 const { currentBasemap, currentOverlays, customLayers, opacities, terrainSource, distanceUnits } =
     settings;
diff --git a/website/src/lib/components/toolbar/Toolbar.svelte b/website/src/lib/components/toolbar/Toolbar.svelte
index 407789943..bd3d0ee9f 100644
--- a/website/src/lib/components/toolbar/Toolbar.svelte
+++ b/website/src/lib/components/toolbar/Toolbar.svelte
@@ -13,7 +13,7 @@
         Scissors,
         MountainSnow,
     } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
 
     let props: {
         class?: string;
diff --git a/website/src/lib/components/toolbar/ToolbarItemMenu.svelte b/website/src/lib/components/toolbar/ToolbarItemMenu.svelte
index 6744ce47e..9ecaa125f 100644
--- a/website/src/lib/components/toolbar/ToolbarItemMenu.svelte
+++ b/website/src/lib/components/toolbar/ToolbarItemMenu.svelte
@@ -12,7 +12,7 @@
     import Reduce from '$lib/components/toolbar/tools/reduce/Reduce.svelte';
     import RoutingControlPopup from '$lib/components/toolbar/tools/routing/RoutingControlPopup.svelte';
     import maplibregl from 'maplibre-gl';
-    import { settings } from '$lib/logic/settings';
+    import { settings } from '$lib/state/settings';
 
     let {
         class: className = '',
diff --git a/website/src/lib/components/toolbar/tools/Clean.svelte b/website/src/lib/components/toolbar/tools/Clean.svelte
index 9ad18841f..2642cbc7f 100644
--- a/website/src/lib/components/toolbar/tools/Clean.svelte
+++ b/website/src/lib/components/toolbar/tools/Clean.svelte
@@ -11,14 +11,14 @@
     import * as RadioGroup from '$lib/components/ui/radio-group';
     import { Button } from '$lib/components/ui/button';
     import Help from '$lib/components/Help.svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { onDestroy, onMount } from 'svelte';
     import { getURLForLanguage } from '$lib/utils';
     import { Trash2 } from '@lucide/svelte';
     import { map } from '$lib/components/map/map';
     import type { GeoJSONSource } from 'maplibre-gl';
     import { engine } from '$lib/engine';
-    import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
+    import { mapCursor, MapCursorState } from '$lib/state/map-cursor';
     import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
 
     let props: {
diff --git a/website/src/lib/components/toolbar/tools/Elevation.svelte b/website/src/lib/components/toolbar/tools/Elevation.svelte
index 71ea76922..8ee3ccbea 100644
--- a/website/src/lib/components/toolbar/tools/Elevation.svelte
+++ b/website/src/lib/components/toolbar/tools/Elevation.svelte
@@ -2,7 +2,7 @@
     import { Button } from '$lib/components/ui/button';
     import Help from '$lib/components/Help.svelte';
     import { MountainSnow } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { getElevation, getURLForLanguage } from '$lib/utils';
     import { engine } from '$lib/engine';
     import { get } from 'svelte/store';
diff --git a/website/src/lib/components/toolbar/tools/Extract.svelte b/website/src/lib/components/toolbar/tools/Extract.svelte
index cdaf9be6e..9d0a3dec1 100644
--- a/website/src/lib/components/toolbar/tools/Extract.svelte
+++ b/website/src/lib/components/toolbar/tools/Extract.svelte
@@ -2,7 +2,7 @@
     import { Button } from '$lib/components/ui/button';
     import { Ungroup } from '@lucide/svelte';
     import Help from '$lib/components/Help.svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { getURLForLanguage } from '$lib/utils';
     import { get } from 'svelte/store';
     import { engine } from '$lib/engine';
diff --git a/website/src/lib/components/toolbar/tools/Merge.svelte b/website/src/lib/components/toolbar/tools/Merge.svelte
index 02530b108..49460707b 100644
--- a/website/src/lib/components/toolbar/tools/Merge.svelte
+++ b/website/src/lib/components/toolbar/tools/Merge.svelte
@@ -11,7 +11,7 @@
     import { Label } from '$lib/components/ui/label/index.js';
     import { Checkbox } from '$lib/components/ui/checkbox';
     import * as RadioGroup from '$lib/components/ui/radio-group';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { Group } from '@lucide/svelte';
     import { getURLForLanguage } from '$lib/utils';
     import Shortcut from '$lib/components/Shortcut.svelte';
diff --git a/website/src/lib/components/toolbar/tools/Time.svelte b/website/src/lib/components/toolbar/tools/Time.svelte
index a5ea5ce86..a7c4eba85 100644
--- a/website/src/lib/components/toolbar/tools/Time.svelte
+++ b/website/src/lib/components/toolbar/tools/Time.svelte
@@ -10,14 +10,14 @@
         getConvertedVelocity,
         milesToKilometers,
         nauticalMilesToKilometers,
-    } from '$lib/units';
+    } from '$lib/units/units';
     import { CalendarDate, type DateValue } from '@internationalized/date';
     import { CalendarClock, CirclePlay, CircleStop, CircleX, Timer, Zap } from '@lucide/svelte';
     import { untrack } from 'svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import Help from '$lib/components/Help.svelte';
     import { getURLForLanguage } from '$lib/utils';
-    import { settings } from '$lib/logic/settings';
+    import { settings } from '$lib/state/settings';
     import { engine } from '$lib/engine';
 
     let props: {
diff --git a/website/src/lib/components/toolbar/tools/reduce/Reduce.svelte b/website/src/lib/components/toolbar/tools/reduce/Reduce.svelte
index ce7026491..32023891c 100644
--- a/website/src/lib/components/toolbar/tools/reduce/Reduce.svelte
+++ b/website/src/lib/components/toolbar/tools/reduce/Reduce.svelte
@@ -4,7 +4,7 @@
     import { Slider } from '$lib/components/ui/slider';
     import Help from '$lib/components/Help.svelte';
     import { Funnel } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import WithUnits from '$lib/components/WithUnits.svelte';
     import { onDestroy } from 'svelte';
     import { getURLForLanguage } from '$lib/utils';
diff --git a/website/src/lib/components/toolbar/tools/routing/Routing.svelte b/website/src/lib/components/toolbar/tools/routing/Routing.svelte
index 2f0fcae22..5cf2d358e 100644
--- a/website/src/lib/components/toolbar/tools/routing/Routing.svelte
+++ b/website/src/lib/components/toolbar/tools/routing/Routing.svelte
@@ -22,16 +22,16 @@
         SquareArrowOutDownRight,
     } from '@lucide/svelte';
     import { routingProfiles } from '$lib/components/toolbar/tools/routing/routing';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { slide } from 'svelte/transition';
     import { get } from 'svelte/store';
     import { getURLForLanguage } from '$lib/utils';
     import { onDestroy, onMount } from 'svelte';
-    import { settings } from '$lib/logic/settings';
+    import { settings } from '$lib/state/settings';
     import { map } from '$lib/components/map/map';
     import { engine } from '$lib/engine';
-    import { newFileName } from '$lib/logic/file-actions';
-    import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
+    import { newFileName } from '$lib/actions/file-actions';
+    import { mapCursor, MapCursorState } from '$lib/state/map-cursor';
     import { RoutingControls } from './routing-controls';
 
     let {
diff --git a/website/src/lib/components/toolbar/tools/routing/RoutingControlPopup.svelte b/website/src/lib/components/toolbar/tools/routing/RoutingControlPopup.svelte
index 07f60bca3..c17b4cf6b 100644
--- a/website/src/lib/components/toolbar/tools/routing/RoutingControlPopup.svelte
+++ b/website/src/lib/components/toolbar/tools/routing/RoutingControlPopup.svelte
@@ -5,7 +5,7 @@
     import { canChangeStart } from './routing-controls';
     import { CirclePlay, Trash2 } from '@lucide/svelte';
 
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
 
     let {
         element = $bindable(),
diff --git a/website/src/lib/components/toolbar/tools/routing/routing-controls.ts b/website/src/lib/components/toolbar/tools/routing/routing-controls.ts
index b96d33312..6be281d80 100644
--- a/website/src/lib/components/toolbar/tools/routing/routing-controls.ts
+++ b/website/src/lib/components/toolbar/tools/routing/routing-controls.ts
@@ -1,4 +1,4 @@
-import { distance, type Coordinates } from '$lib/geo';
+import { distance, type Coordinates } from '$lib/geo/coordinates';
 import { get, writable } from 'svelte/store';
 import maplibregl, {
     type MapMouseEvent,
@@ -9,14 +9,14 @@ import maplibregl, {
 import { route } from './routing';
 import { toast } from 'svelte-sonner';
 import { loadSVGIcon } from '$lib/utils';
-import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
+import { mapCursor, MapCursorState } from '$lib/state/map-cursor';
 import { currentTool, Tool } from '$lib/components/toolbar/tools';
 import { streetViewEnabled } from '$lib/components/map/street-view-control/utils';
-import { i18n } from '$lib/i18n.svelte';
+import { i18n } from '$lib/i18n/i18n.svelte';
 import { map } from '$lib/components/map/map';
 import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
-import { settings } from '$lib/logic/settings';
-import { closestPointIndexIn } from '$lib/closest-point';
+import { settings } from '$lib/state/settings';
+import { closestPointIndexIn } from '$lib/geo/closest-point';
 import {
     engine,
     type Selection,
diff --git a/website/src/lib/components/toolbar/tools/routing/routing.test.ts b/website/src/lib/components/toolbar/tools/routing/routing.test.ts
index 2471e7084..4b39fc7c7 100644
--- a/website/src/lib/components/toolbar/tools/routing/routing.test.ts
+++ b/website/src/lib/components/toolbar/tools/routing/routing.test.ts
@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import { distance } from '$lib/geo';
+import { distance } from '$lib/geo/coordinates';
 import {
     brouterError,
     getTags,
diff --git a/website/src/lib/components/toolbar/tools/routing/routing.ts b/website/src/lib/components/toolbar/tools/routing/routing.ts
index 40e73b8e1..d416b9d12 100644
--- a/website/src/lib/components/toolbar/tools/routing/routing.ts
+++ b/website/src/lib/components/toolbar/tools/routing/routing.ts
@@ -1,5 +1,5 @@
-import { distance, type Coordinates } from '$lib/geo';
-import { settings } from '$lib/logic/settings';
+import { distance, type Coordinates } from '$lib/geo/coordinates';
+import { settings } from '$lib/state/settings';
 import { getElevation } from '$lib/utils';
 import { get } from 'svelte/store';
 
diff --git a/website/src/lib/components/toolbar/tools/scissors/Scissors.svelte b/website/src/lib/components/toolbar/tools/scissors/Scissors.svelte
index b51f031de..a50de3519 100644
--- a/website/src/lib/components/toolbar/tools/scissors/Scissors.svelte
+++ b/website/src/lib/components/toolbar/tools/scissors/Scissors.svelte
@@ -7,12 +7,12 @@
     import * as Select from '$lib/components/ui/select';
     import { Separator } from '$lib/components/ui/separator';
     import { map } from '$lib/components/map/map';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { onDestroy, onMount, untrack } from 'svelte';
     import { Crop } from '@lucide/svelte';
     import { SplitControls } from './split-controls';
     import { getURLForLanguage } from '$lib/utils';
-    import { slicedStatistics } from '$lib/logic/selection-statistics';
+    import { slicedStatistics } from '$lib/state/selection-statistics';
     import { engine } from '$lib/engine';
 
     let props: {
diff --git a/website/src/lib/components/toolbar/tools/scissors/scissors.ts b/website/src/lib/components/toolbar/tools/scissors/scissors.ts
index 290d3991d..dd24c9cbb 100644
--- a/website/src/lib/components/toolbar/tools/scissors/scissors.ts
+++ b/website/src/lib/components/toolbar/tools/scissors/scissors.ts
@@ -1,6 +1,6 @@
 import { get, writable, type Writable } from 'svelte/store';
 import { engine, type SplitType as EngineSplitType } from '$lib/engine';
-import { closestPointIndexIn } from '$lib/closest-point';
+import { closestPointIndexIn } from '$lib/geo/closest-point';
 
 /** What a split cuts in two, the values being the ones of the engine. */
 export const SplitType = {
diff --git a/website/src/lib/components/toolbar/tools/scissors/split-controls.ts b/website/src/lib/components/toolbar/tools/scissors/split-controls.ts
index 3242349d0..98100b922 100644
--- a/website/src/lib/components/toolbar/tools/scissors/split-controls.ts
+++ b/website/src/lib/components/toolbar/tools/scissors/split-controls.ts
@@ -2,7 +2,7 @@ import { currentTool, Tool } from '$lib/components/toolbar/tools';
 import { splitAs } from '$lib/components/toolbar/tools/scissors/scissors';
 import { Scissors } from 'lucide-static';
 import { get } from 'svelte/store';
-import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
+import { mapCursor, MapCursorState } from '$lib/state/map-cursor';
 import type { GeoJSONSource } from 'maplibre-gl';
 import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
 import type { MapLayerEventManager } from '$lib/components/map/map-layer-event-manager';
diff --git a/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte b/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte
index 8b94adb69..e0915fd7e 100644
--- a/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte
+++ b/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte
@@ -4,18 +4,18 @@
     import { Label } from '$lib/components/ui/label/index.js';
     import { Button } from '$lib/components/ui/button';
     import * as Select from '$lib/components/ui/select';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import Help from '$lib/components/Help.svelte';
     import { onDestroy, onMount, untrack } from 'svelte';
     import { getURLForLanguage } from '$lib/utils';
     import { MapPin, CircleX, Save } from '@lucide/svelte';
-    import { getSymbolKey, symbols } from '$lib/assets/symbols';
+    import { getSymbolKey, symbols } from '$lib/data/symbols';
     import { engine } from '$lib/engine';
-    import { selectionSize } from '$lib/selection-helpers';
+    import { selectionSize } from '$lib/engine/selection-helpers';
     import { getElevation } from '$lib/utils';
     import { selectedWaypoint } from './waypoint';
     import { map } from '$lib/components/map/map';
-    import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
+    import { mapCursor, MapCursorState } from '$lib/state/map-cursor';
     import maplibregl from 'maplibre-gl';
     import { getSvgForSymbol } from '$lib/components/map/gpx-layer/gpx-layer';
 
diff --git a/website/src/lib/components/toolbar/tools/waypoint/waypoint.ts b/website/src/lib/components/toolbar/tools/waypoint/waypoint.ts
index 8149d0d5e..9692bbfb4 100644
--- a/website/src/lib/components/toolbar/tools/waypoint/waypoint.ts
+++ b/website/src/lib/components/toolbar/tools/waypoint/waypoint.ts
@@ -1,6 +1,6 @@
 import { get, writable } from 'svelte/store';
 import { engine, type WaypointDetails } from '$lib/engine';
-import { settings } from '$lib/logic/settings';
+import { settings } from '$lib/state/settings';
 
 export type SelectedWaypoint = {
     fileId: string;
diff --git a/website/src/lib/assets/colors.test.ts b/website/src/lib/data/colors.test.ts
similarity index 98%
rename from website/src/lib/assets/colors.test.ts
rename to website/src/lib/data/colors.test.ts
index eff2aa805..52d48e19c 100644
--- a/website/src/lib/assets/colors.test.ts
+++ b/website/src/lib/data/colors.test.ts
@@ -6,7 +6,7 @@ import {
     getSurfaceColor,
     highwayColors,
     surfaceColors,
-} from './colors';
+} from '$lib/data/colors';
 
 describe('colors of the OSM data', () => {
     it('has the color of a surface, or the one of the missing ones', () => {
diff --git a/website/src/lib/assets/colors.ts b/website/src/lib/data/colors.ts
similarity index 100%
rename from website/src/lib/assets/colors.ts
rename to website/src/lib/data/colors.ts
diff --git a/website/src/lib/assets/custom/bikerouter-gravel.json b/website/src/lib/data/custom/bikerouter-gravel.json
similarity index 100%
rename from website/src/lib/assets/custom/bikerouter-gravel.json
rename to website/src/lib/data/custom/bikerouter-gravel.json
diff --git a/website/src/lib/assets/custom/ign-fr-plan.json b/website/src/lib/data/custom/ign-fr-plan.json
similarity index 100%
rename from website/src/lib/assets/custom/ign-fr-plan.json
rename to website/src/lib/data/custom/ign-fr-plan.json
diff --git a/website/src/lib/assets/custom/ign-fr-satellite.json b/website/src/lib/data/custom/ign-fr-satellite.json
similarity index 100%
rename from website/src/lib/assets/custom/ign-fr-satellite.json
rename to website/src/lib/data/custom/ign-fr-satellite.json
diff --git a/website/src/lib/assets/custom/ign-fr-topo.json b/website/src/lib/data/custom/ign-fr-topo.json
similarity index 100%
rename from website/src/lib/assets/custom/ign-fr-topo.json
rename to website/src/lib/data/custom/ign-fr-topo.json
diff --git a/website/src/lib/assets/example-data.ts b/website/src/lib/data/example/example-data.ts
similarity index 100%
rename from website/src/lib/assets/example-data.ts
rename to website/src/lib/data/example/example-data.ts
diff --git a/website/src/lib/assets/example.gpx b/website/src/lib/data/example/example.gpx
similarity index 100%
rename from website/src/lib/assets/example.gpx
rename to website/src/lib/data/example/example.gpx
diff --git a/website/src/lib/assets/example.test.ts b/website/src/lib/data/example/example.test.ts
similarity index 88%
rename from website/src/lib/assets/example.test.ts
rename to website/src/lib/data/example/example.test.ts
index 165cec782..cb9ee516e 100644
--- a/website/src/lib/assets/example.test.ts
+++ b/website/src/lib/data/example/example.test.ts
@@ -1,8 +1,8 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import { computeExampleData, engineIsBuilt } from '../scripts/example-statistics';
-import { exampleData } from './example-data';
-import { exampleStatistics } from './example';
+import { computeExampleData, engineIsBuilt } from '$lib/scripts/example-statistics';
+import { exampleData } from '$lib/data/example/example-data';
+import { exampleStatistics } from '$lib/data/example';
 
 describe('exampleStatistics', () => {
     it('has the statistics of the whole example for the whole range', () => {
diff --git a/website/src/lib/assets/example.ts b/website/src/lib/data/example/index.ts
similarity index 97%
rename from website/src/lib/assets/example.ts
rename to website/src/lib/data/example/index.ts
index 643dc1012..4281082c6 100644
--- a/website/src/lib/assets/example.ts
+++ b/website/src/lib/data/example/index.ts
@@ -5,7 +5,7 @@
  * they are (see `example-data.ts`) so that the example does not need the engine.
  */
 import type { GlobalStatistics, SelectionStatistics } from '$lib/engine';
-import { exampleData as data } from './example-data';
+import { exampleData as data } from '$lib/data/example/example-data';
 
 const length = data.lng.length;
 
diff --git a/website/src/lib/assets/layers.test.ts b/website/src/lib/data/layers.test.ts
similarity index 99%
rename from website/src/lib/assets/layers.test.ts
rename to website/src/lib/data/layers.test.ts
index cc99e58ca..44d0f5ec8 100644
--- a/website/src/lib/assets/layers.test.ts
+++ b/website/src/lib/data/layers.test.ts
@@ -18,7 +18,7 @@ import {
     overpassTree,
     terrainSources,
     type LayerTreeType,
-} from './layers';
+} from '$lib/data/layers';
 import { getLayers } from '$lib/components/map/layer-control/utils';
 
 const leaves = (tree: LayerTreeType) => Object.keys(getLayers(tree));
diff --git a/website/src/lib/assets/layers.ts b/website/src/lib/data/layers.ts
similarity index 99%
rename from website/src/lib/assets/layers.ts
rename to website/src/lib/data/layers.ts
index 99b94dde1..18818306e 100644
--- a/website/src/lib/assets/layers.ts
+++ b/website/src/lib/data/layers.ts
@@ -23,10 +23,10 @@ import {
     Toilet,
 } from 'lucide-static';
 import { type RasterDEMSourceSpecification, type StyleSpecification } from 'maplibre-gl';
-import ignFrTopo from './custom/ign-fr-topo.json';
-import ignFrPlan from './custom/ign-fr-plan.json';
-import ignFrSatellite from './custom/ign-fr-satellite.json';
-import bikerouterGravel from './custom/bikerouter-gravel.json';
+import ignFrTopo from '$lib/data/custom/ign-fr-topo.json';
+import ignFrPlan from '$lib/data/custom/ign-fr-plan.json';
+import ignFrSatellite from '$lib/data/custom/ign-fr-satellite.json';
+import bikerouterGravel from '$lib/data/custom/bikerouter-gravel.json';
 
 export const maptilerKeyPlaceHolder = 'MAPTILER_KEY';
 
diff --git a/website/src/lib/assets/symbols.ts b/website/src/lib/data/symbols.ts
similarity index 100%
rename from website/src/lib/assets/symbols.ts
rename to website/src/lib/data/symbols.ts
diff --git a/website/src/lib/docs/be/files-and-stats.mdx b/website/src/lib/docs/be/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/be/files-and-stats.mdx
+++ b/website/src/lib/docs/be/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/ca/files-and-stats.mdx b/website/src/lib/docs/ca/files-and-stats.mdx
index 709cd45ad..63d34f12f 100644
--- a/website/src/lib/docs/ca/files-and-stats.mdx
+++ b/website/src/lib/docs/ca/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Fitxers i estadístiques
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/cs/files-and-stats.mdx b/website/src/lib/docs/cs/files-and-stats.mdx
index 420526de0..241655404 100644
--- a/website/src/lib/docs/cs/files-and-stats.mdx
+++ b/website/src/lib/docs/cs/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Soubory a statistiky
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/da/files-and-stats.mdx b/website/src/lib/docs/da/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/da/files-and-stats.mdx
+++ b/website/src/lib/docs/da/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/de/files-and-stats.mdx b/website/src/lib/docs/de/files-and-stats.mdx
index 66cf79370..bc7cb4e39 100644
--- a/website/src/lib/docs/de/files-and-stats.mdx
+++ b/website/src/lib/docs/de/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Dateien und Statistiken
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/el/files-and-stats.mdx b/website/src/lib/docs/el/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/el/files-and-stats.mdx
+++ b/website/src/lib/docs/el/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/en/files-and-stats.mdx b/website/src/lib/docs/en/files-and-stats.mdx
index e31e0eede..00f85c821 100644
--- a/website/src/lib/docs/en/files-and-stats.mdx
+++ b/website/src/lib/docs/en/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/es/files-and-stats.mdx b/website/src/lib/docs/es/files-and-stats.mdx
index fc3968ee7..3af8e2491 100644
--- a/website/src/lib/docs/es/files-and-stats.mdx
+++ b/website/src/lib/docs/es/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Archivos y estadísticas
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/eu/files-and-stats.mdx b/website/src/lib/docs/eu/files-and-stats.mdx
index 811aa331f..0886fbfda 100644
--- a/website/src/lib/docs/eu/files-and-stats.mdx
+++ b/website/src/lib/docs/eu/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Fitxategiak eta estatistikak
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/fi/files-and-stats.mdx b/website/src/lib/docs/fi/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/fi/files-and-stats.mdx
+++ b/website/src/lib/docs/fi/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/fr/files-and-stats.mdx b/website/src/lib/docs/fr/files-and-stats.mdx
index 3342c45cc..e23c63161 100644
--- a/website/src/lib/docs/fr/files-and-stats.mdx
+++ b/website/src/lib/docs/fr/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Fichiers et statistiques
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/he/files-and-stats.mdx b/website/src/lib/docs/he/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/he/files-and-stats.mdx
+++ b/website/src/lib/docs/he/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/hu/files-and-stats.mdx b/website/src/lib/docs/hu/files-and-stats.mdx
index 56e26d704..5b8935a99 100644
--- a/website/src/lib/docs/hu/files-and-stats.mdx
+++ b/website/src/lib/docs/hu/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Fájlok és statisztikák
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/id/files-and-stats.mdx b/website/src/lib/docs/id/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/id/files-and-stats.mdx
+++ b/website/src/lib/docs/id/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/it/files-and-stats.mdx b/website/src/lib/docs/it/files-and-stats.mdx
index 72550ecfc..b9dd38e66 100644
--- a/website/src/lib/docs/it/files-and-stats.mdx
+++ b/website/src/lib/docs/it/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: File e statistiche
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/ko/files-and-stats.mdx b/website/src/lib/docs/ko/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/ko/files-and-stats.mdx
+++ b/website/src/lib/docs/ko/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/lt/files-and-stats.mdx b/website/src/lib/docs/lt/files-and-stats.mdx
index 1ea9e1bc5..5e851c178 100644
--- a/website/src/lib/docs/lt/files-and-stats.mdx
+++ b/website/src/lib/docs/lt/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Puslapis nerastas
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/lv/files-and-stats.mdx b/website/src/lib/docs/lv/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/lv/files-and-stats.mdx
+++ b/website/src/lib/docs/lv/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/nl/files-and-stats.mdx b/website/src/lib/docs/nl/files-and-stats.mdx
index 577ede45a..29e9aada8 100644
--- a/website/src/lib/docs/nl/files-and-stats.mdx
+++ b/website/src/lib/docs/nl/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Bestanden en statistieken
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/no/files-and-stats.mdx b/website/src/lib/docs/no/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/no/files-and-stats.mdx
+++ b/website/src/lib/docs/no/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/pl/files-and-stats.mdx b/website/src/lib/docs/pl/files-and-stats.mdx
index 337e72cef..0b51f71f4 100644
--- a/website/src/lib/docs/pl/files-and-stats.mdx
+++ b/website/src/lib/docs/pl/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Pliki i statystyki
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/pt-BR/files-and-stats.mdx b/website/src/lib/docs/pt-BR/files-and-stats.mdx
index 3b103e13d..9e31ab7a8 100644
--- a/website/src/lib/docs/pt-BR/files-and-stats.mdx
+++ b/website/src/lib/docs/pt-BR/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Arquivos e estatísticas
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/pt/files-and-stats.mdx b/website/src/lib/docs/pt/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/pt/files-and-stats.mdx
+++ b/website/src/lib/docs/pt/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/ro/files-and-stats.mdx b/website/src/lib/docs/ro/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/ro/files-and-stats.mdx
+++ b/website/src/lib/docs/ro/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/ru/files-and-stats.mdx b/website/src/lib/docs/ru/files-and-stats.mdx
index b88e09c5f..fe7a20f25 100644
--- a/website/src/lib/docs/ru/files-and-stats.mdx
+++ b/website/src/lib/docs/ru/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Файлы и статистика
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/sr/files-and-stats.mdx b/website/src/lib/docs/sr/files-and-stats.mdx
index 28e743cd5..e34f27fee 100644
--- a/website/src/lib/docs/sr/files-and-stats.mdx
+++ b/website/src/lib/docs/sr/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Datoteke i statistike
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/sv/files-and-stats.mdx b/website/src/lib/docs/sv/files-and-stats.mdx
index e413b7fe9..980efd7c4 100644
--- a/website/src/lib/docs/sv/files-and-stats.mdx
+++ b/website/src/lib/docs/sv/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/th/files-and-stats.mdx b/website/src/lib/docs/th/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/th/files-and-stats.mdx
+++ b/website/src/lib/docs/th/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/tr/files-and-stats.mdx b/website/src/lib/docs/tr/files-and-stats.mdx
index c3ad30ccd..4256a7917 100644
--- a/website/src/lib/docs/tr/files-and-stats.mdx
+++ b/website/src/lib/docs/tr/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Dosyalar ve istatistikler
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/uk/files-and-stats.mdx b/website/src/lib/docs/uk/files-and-stats.mdx
index 4ee58a394..f9f5cf7d3 100644
--- a/website/src/lib/docs/uk/files-and-stats.mdx
+++ b/website/src/lib/docs/uk/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Файли та статистика
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/vi/files-and-stats.mdx b/website/src/lib/docs/vi/files-and-stats.mdx
index 3ccc29ad6..627201017 100644
--- a/website/src/lib/docs/vi/files-and-stats.mdx
+++ b/website/src/lib/docs/vi/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: Files and statistics
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/zh-HK/files-and-stats.mdx b/website/src/lib/docs/zh-HK/files-and-stats.mdx
index 4d3ba64c1..6d087142c 100644
--- a/website/src/lib/docs/zh-HK/files-and-stats.mdx
+++ b/website/src/lib/docs/zh-HK/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: 檔案和統計
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/docs/zh/files-and-stats.mdx b/website/src/lib/docs/zh/files-and-stats.mdx
index 4f38963c2..39dc40d07 100644
--- a/website/src/lib/docs/zh/files-and-stats.mdx
+++ b/website/src/lib/docs/zh/files-and-stats.mdx
@@ -7,7 +7,7 @@ title: 文件和统计
     import DocsNote from '$lib/components/docs/DocsNote.svelte';
     import ElevationProfile from '$lib/components/elevation-profile/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { exampleStatistics } from '$lib/data/example';
     import { writable } from 'svelte/store';
 
     let statistics = writable(exampleStatistics);
diff --git a/website/src/lib/all-hidden.ts b/website/src/lib/engine/all-hidden.ts
similarity index 95%
rename from website/src/lib/all-hidden.ts
rename to website/src/lib/engine/all-hidden.ts
index 74a42113a..2a0ecb373 100644
--- a/website/src/lib/all-hidden.ts
+++ b/website/src/lib/engine/all-hidden.ts
@@ -1,6 +1,6 @@
 import { readable } from 'svelte/store';
 import { engine, FileStateCollectionObserver, type FileState, type Selection } from '$lib/engine';
-import { isSelectionHidden } from '$lib/selection-helpers';
+import { isSelectionHidden } from '$lib/engine/selection-helpers';
 
 /**
  * Whether all the selected elements are hidden. It follows the selection and, through the
diff --git a/website/src/lib/engine/engine.test.ts b/website/src/lib/engine/engine.test.ts
index 889b56f06..a20f90b2b 100644
--- a/website/src/lib/engine/engine.test.ts
+++ b/website/src/lib/engine/engine.test.ts
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
 import { readFileSync } from 'node:fs';
 import { beforeEach, describe, it } from 'node:test';
 import { get } from 'svelte/store';
-import { isHidden } from '$lib/file-visibility';
+import { isHidden } from '$lib/engine/file-visibility';
 import {
     ALL_EXPORT_OPTIONS,
     engine,
diff --git a/website/src/lib/engine/engine.ts b/website/src/lib/engine/engine.ts
index adb4ae29c..0b6a99294 100644
--- a/website/src/lib/engine/engine.ts
+++ b/website/src/lib/engine/engine.ts
@@ -1,14 +1,14 @@
 import { browser } from '$app/environment';
 import { get, writable, type Readable, type Writable } from 'svelte/store';
-import { FileColorAllocator } from '$lib/file-colors';
+import { FileColorAllocator } from '$lib/engine/file-colors';
 import {
     setHidden,
     stringifyVisibility,
     VISIBILITY_KEY,
     type Visibility,
-} from '$lib/file-visibility';
-import { categoryIntervals } from '$lib/trackpoint-categories';
-import { selectedElementIds, type FileTreeNode } from '$lib/selection-helpers';
+} from '$lib/engine/file-visibility';
+import { categoryIntervals } from '$lib/engine/trackpoint-categories';
+import { selectedElementIds, type FileTreeNode } from '$lib/engine/selection-helpers';
 import type { RouteAttributes } from 'gpx-rs';
 import { idsToBytes, selectMode, type Wasm } from './convert';
 import { readFileState } from './file-state';
diff --git a/website/src/lib/file-colors.test.ts b/website/src/lib/engine/file-colors.test.ts
similarity index 97%
rename from website/src/lib/file-colors.test.ts
rename to website/src/lib/engine/file-colors.test.ts
index 5e1350e10..3c2ff189f 100644
--- a/website/src/lib/file-colors.test.ts
+++ b/website/src/lib/engine/file-colors.test.ts
@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import { FileColorAllocator, normalizeColor } from './file-colors';
+import { FileColorAllocator, normalizeColor } from '$lib/engine/file-colors';
 
 describe('normalizeColor', () => {
     it('adds the # of hex colors that have none', () => {
diff --git a/website/src/lib/file-colors.ts b/website/src/lib/engine/file-colors.ts
similarity index 100%
rename from website/src/lib/file-colors.ts
rename to website/src/lib/engine/file-colors.ts
diff --git a/website/src/lib/engine/file-state.ts b/website/src/lib/engine/file-state.ts
index 11a525dae..92599a2ae 100644
--- a/website/src/lib/engine/file-state.ts
+++ b/website/src/lib/engine/file-state.ts
@@ -1,6 +1,6 @@
 import type { Feature, LineString } from 'geojson';
-import { normalizeColor, type FileColorAllocator } from '$lib/file-colors';
-import type { Visibility } from '$lib/file-visibility';
+import { normalizeColor, type FileColorAllocator } from '$lib/engine/file-colors';
+import type { Visibility } from '$lib/engine/file-visibility';
 import { toPositions, type Wasm } from './convert';
 import { EMPTY_STATISTICS, type FileState, type SegmentProperties } from './types';
 
diff --git a/website/src/lib/file-visibility.test.ts b/website/src/lib/engine/file-visibility.test.ts
similarity index 99%
rename from website/src/lib/file-visibility.test.ts
rename to website/src/lib/engine/file-visibility.test.ts
index 2bc476ca3..84b6db04a 100644
--- a/website/src/lib/file-visibility.test.ts
+++ b/website/src/lib/engine/file-visibility.test.ts
@@ -11,7 +11,7 @@ import {
     waypointsKey,
     type Visibility,
     type VisibilityState,
-} from './file-visibility';
+} from '$lib/engine/file-visibility';
 
 const segment = (id: string) => ({ id, rev: `rev-${id}`, length: 2 });
 
diff --git a/website/src/lib/file-visibility.ts b/website/src/lib/engine/file-visibility.ts
similarity index 100%
rename from website/src/lib/file-visibility.ts
rename to website/src/lib/engine/file-visibility.ts
diff --git a/website/src/lib/selection-helpers.test.ts b/website/src/lib/engine/selection-helpers.test.ts
similarity index 98%
rename from website/src/lib/selection-helpers.test.ts
rename to website/src/lib/engine/selection-helpers.test.ts
index afcc9dc1d..4e6b59d96 100644
--- a/website/src/lib/selection-helpers.test.ts
+++ b/website/src/lib/engine/selection-helpers.test.ts
@@ -1,7 +1,7 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 import type { Clipboard, FileStructure, Selection } from 'gpx-rs';
-import type { VisibilityState } from './file-visibility';
+import type { VisibilityState } from '$lib/engine/file-visibility';
 import {
     elementId,
     hasSelectionWithin,
@@ -14,7 +14,7 @@ import {
     selectedFileIds,
     selectionSize,
     type FileTreeNode,
-} from './selection-helpers';
+} from '$lib/engine/selection-helpers';
 
 // Two files; F1 has the tracks T1 (segments S1, S2) and T2 (segment S3), and waypoints W1, W2.
 const nodes: Record<string, FileTreeNode> = {
diff --git a/website/src/lib/selection-helpers.ts b/website/src/lib/engine/selection-helpers.ts
similarity index 99%
rename from website/src/lib/selection-helpers.ts
rename to website/src/lib/engine/selection-helpers.ts
index 7b483dfbe..5f47b276a 100644
--- a/website/src/lib/selection-helpers.ts
+++ b/website/src/lib/engine/selection-helpers.ts
@@ -1,5 +1,5 @@
 import type { Clipboard, Selection } from 'gpx-rs';
-import { isHidden, waypointsKey, type VisibilityState } from '$lib/file-visibility';
+import { isHidden, waypointsKey, type VisibilityState } from '$lib/engine/file-visibility';
 
 /**
  * An element of the file tree, to ask questions about the selection:
diff --git a/website/src/lib/engine/statistics.ts b/website/src/lib/engine/statistics.ts
index da604426c..00815b920 100644
--- a/website/src/lib/engine/statistics.ts
+++ b/website/src/lib/engine/statistics.ts
@@ -1,5 +1,5 @@
 import { get, writable, type Readable } from 'svelte/store';
-import { categoryIntervals, type CategoryIntervals } from '$lib/trackpoint-categories';
+import { categoryIntervals, type CategoryIntervals } from '$lib/engine/trackpoint-categories';
 import type { Wasm } from './convert';
 import {
     EMPTY_SELECTION_STATISTICS,
diff --git a/website/src/lib/engine/storage.ts b/website/src/lib/engine/storage.ts
index c8e739a51..1f0dcc8bf 100644
--- a/website/src/lib/engine/storage.ts
+++ b/website/src/lib/engine/storage.ts
@@ -1,5 +1,5 @@
-import { LEGACY_IMPORTED_KEY, readLegacyData } from '$lib/legacy-import';
-import { parseVisibility, VISIBILITY_KEY, type Visibility } from '$lib/file-visibility';
+import { LEGACY_IMPORTED_KEY, readLegacyData } from '$lib/storage/legacy-import';
+import { parseVisibility, VISIBILITY_KEY, type Visibility } from '$lib/engine/file-visibility';
 import type { Outcome, StorageOpened } from 'gpx-rs';
 import type { Wasm } from './convert';
 
diff --git a/website/src/lib/trackpoint-categories.test.ts b/website/src/lib/engine/trackpoint-categories.test.ts
similarity index 95%
rename from website/src/lib/trackpoint-categories.test.ts
rename to website/src/lib/engine/trackpoint-categories.test.ts
index 6ac8df9c0..abcef5251 100644
--- a/website/src/lib/trackpoint-categories.test.ts
+++ b/website/src/lib/engine/trackpoint-categories.test.ts
@@ -1,6 +1,10 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
-import { categoryIntervals, categoryValues, type CategoryIntervals } from './trackpoint-categories';
+import {
+    categoryIntervals,
+    categoryValues,
+    type CategoryIntervals,
+} from '$lib/engine/trackpoint-categories';
 
 describe('categoryValues', () => {
     // asphalt, asphalt, unknown, gravel, gravel, gravel, unknown
diff --git a/website/src/lib/trackpoint-categories.ts b/website/src/lib/engine/trackpoint-categories.ts
similarity index 100%
rename from website/src/lib/trackpoint-categories.ts
rename to website/src/lib/engine/trackpoint-categories.ts
diff --git a/website/src/lib/engine/types.ts b/website/src/lib/engine/types.ts
index 2acdc229d..5092556cd 100644
--- a/website/src/lib/engine/types.ts
+++ b/website/src/lib/engine/types.ts
@@ -1,7 +1,7 @@
 import type { Readable } from 'svelte/store';
 import type { Feature, FeatureCollection, LineString, Point } from 'geojson';
-import type { Visibility } from '$lib/file-visibility';
-import type { CategoryIntervals } from '$lib/trackpoint-categories';
+import type { Visibility } from '$lib/engine/file-visibility';
+import type { CategoryIntervals } from '$lib/engine/trackpoint-categories';
 import type { FileStructure, GlobalStatistics } from 'gpx-rs';
 
 export type {
diff --git a/website/src/lib/closest-point.test.ts b/website/src/lib/geo/closest-point.test.ts
similarity index 96%
rename from website/src/lib/closest-point.test.ts
rename to website/src/lib/geo/closest-point.test.ts
index b4766e934..f7678e2b6 100644
--- a/website/src/lib/closest-point.test.ts
+++ b/website/src/lib/geo/closest-point.test.ts
@@ -1,6 +1,6 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
-import { closestPointIndex, closestPointIndexIn } from './closest-point';
+import { closestPointIndex, closestPointIndexIn } from '$lib/geo/closest-point';
 
 describe('closestPointIndex', () => {
     const line = [0, 0, 1, 0, 2, 0, 2, 1];
diff --git a/website/src/lib/closest-point.ts b/website/src/lib/geo/closest-point.ts
similarity index 100%
rename from website/src/lib/closest-point.ts
rename to website/src/lib/geo/closest-point.ts
diff --git a/website/src/lib/geo.test.ts b/website/src/lib/geo/coordinates.test.ts
similarity index 96%
rename from website/src/lib/geo.test.ts
rename to website/src/lib/geo/coordinates.test.ts
index 415371625..b0ab6a44b 100644
--- a/website/src/lib/geo.test.ts
+++ b/website/src/lib/geo/coordinates.test.ts
@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import { distance } from './geo';
+import { distance } from '$lib/geo/coordinates';
 
 describe('distance', () => {
     it('is zero between a point and itself', () => {
diff --git a/website/src/lib/geo.ts b/website/src/lib/geo/coordinates.ts
similarity index 100%
rename from website/src/lib/geo.ts
rename to website/src/lib/geo/coordinates.ts
diff --git a/website/src/lib/i18n.svelte.ts b/website/src/lib/i18n/i18n.svelte.ts
similarity index 100%
rename from website/src/lib/i18n.svelte.ts
rename to website/src/lib/i18n/i18n.svelte.ts
diff --git a/website/src/lib/i18n-keys.test.ts b/website/src/lib/i18n/keys.test.ts
similarity index 96%
rename from website/src/lib/i18n-keys.test.ts
rename to website/src/lib/i18n/keys.test.ts
index 876ba9a4c..1d878ad5a 100644
--- a/website/src/lib/i18n-keys.test.ts
+++ b/website/src/lib/i18n/keys.test.ts
@@ -5,9 +5,9 @@ import { readdirSync, readFileSync } from 'node:fs';
 import { describe, it } from 'node:test';
 import { fileURLToPath } from 'node:url';
 import { join } from 'node:path';
-import { languages } from './languages';
+import { languages } from '$lib/i18n/languages';
 
-const src = fileURLToPath(new URL('..', import.meta.url));
+const src = fileURLToPath(new URL('../..', import.meta.url));
 
 function sources(dir: string): string[] {
     return readdirSync(dir, { withFileTypes: true }).flatMap((entry) => {
diff --git a/website/src/lib/languages.ts b/website/src/lib/i18n/languages.ts
similarity index 100%
rename from website/src/lib/languages.ts
rename to website/src/lib/i18n/languages.ts
diff --git a/website/src/lib/index.ts b/website/src/lib/index.ts
deleted file mode 100644
index 856f2b6c3..000000000
--- a/website/src/lib/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-// place files you want to import through the `$lib` alias in this folder.
diff --git a/website/src/lib/scripts/example-statistics.ts b/website/src/lib/scripts/example-statistics.ts
index 8abca0ce5..3fd56ad04 100644
--- a/website/src/lib/scripts/example-statistics.ts
+++ b/website/src/lib/scripts/example-statistics.ts
@@ -1,6 +1,6 @@
 /**
- * Computes the statistics of `assets/example.gpx` with the engine, and writes them to
- * `assets/example-data.ts`, where the pages that show an example (the home page, the
+ * Computes the statistics of `data/example/example.gpx` with the engine, and writes them to
+ * `data/example/example-data.ts`, where the pages that show an example (the home page, the
  * documentation) take them from. Run it when the example, or the way the engine computes the
  * statistics, changes:
  *
@@ -15,11 +15,11 @@ import { fileURLToPath, pathToFileURL } from 'url';
 import prettier from 'prettier';
 
 const here = path.dirname(fileURLToPath(import.meta.url));
-const assets = path.resolve(here, '../assets');
+const example = path.resolve(here, '../data/example');
 const packageDirectory = path.resolve(here, '../../../../gpx-rs/pkg');
 
-export const exampleGPX = path.join(assets, 'example.gpx');
-export const exampleData = path.join(assets, 'example-data.ts');
+export const exampleGPX = path.join(example, 'example.gpx');
+export const exampleData = path.join(example, 'example-data.ts');
 
 /** Whether the engine is built. */
 export function engineIsBuilt() {
diff --git a/website/src/lib/scripts/pwa-manifest.ts b/website/src/lib/scripts/pwa-manifest.ts
index bc5d9ec31..62dbcf2bd 100644
--- a/website/src/lib/scripts/pwa-manifest.ts
+++ b/website/src/lib/scripts/pwa-manifest.ts
@@ -1,5 +1,5 @@
 import fs from 'fs';
-import { languages } from '../languages';
+import { languages } from '$lib/i18n/languages';
 
 function localizeManifest(manifestTemplateData: any, language: string) {
     const localizedManifestFile = `static/${language}.manifest.webmanifest`;
diff --git a/website/src/lib/scripts/sitemap.ts b/website/src/lib/scripts/sitemap.ts
index 923765a0b..56d7cc747 100644
--- a/website/src/lib/scripts/sitemap.ts
+++ b/website/src/lib/scripts/sitemap.ts
@@ -1,6 +1,6 @@
 import fs from 'fs';
 import { glob } from 'glob';
-import { languages } from '$lib/languages';
+import { languages } from '$lib/i18n/languages';
 
 function getURLForLanguage(lang: string, path: string): string {
     return `https://gpx.studio${lang === 'en' ? '' : `/${lang}`}${path}`;
diff --git a/website/src/lib/logic/bounds.ts b/website/src/lib/state/bounds.ts
similarity index 100%
rename from website/src/lib/logic/bounds.ts
rename to website/src/lib/state/bounds.ts
diff --git a/website/src/lib/logic/map-cursor.ts b/website/src/lib/state/map-cursor.ts
similarity index 100%
rename from website/src/lib/logic/map-cursor.ts
rename to website/src/lib/state/map-cursor.ts
diff --git a/website/src/lib/logic/selection-statistics.ts b/website/src/lib/state/selection-statistics.ts
similarity index 93%
rename from website/src/lib/logic/selection-statistics.ts
rename to website/src/lib/state/selection-statistics.ts
index f239b625e..942293cb3 100644
--- a/website/src/lib/logic/selection-statistics.ts
+++ b/website/src/lib/state/selection-statistics.ts
@@ -1,6 +1,6 @@
 import { writable, type Writable } from 'svelte/store';
 import { engine, type GlobalStatistics } from '$lib/engine';
-import type { Coordinates } from '$lib/geo';
+import type { Coordinates } from '$lib/geo/coordinates';
 
 /** The part of the selection that is highlighted in the elevation profile. */
 export type SlicedStatistics = {
diff --git a/website/src/lib/logic/setting.test.ts b/website/src/lib/state/setting.test.ts
similarity index 98%
rename from website/src/lib/logic/setting.test.ts
rename to website/src/lib/state/setting.test.ts
index 50dfa5250..3b2002c99 100644
--- a/website/src/lib/logic/setting.test.ts
+++ b/website/src/lib/state/setting.test.ts
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { afterEach, beforeEach, describe, it } from 'node:test';
 import { get } from 'svelte/store';
-import type { LayerTreeType } from '$lib/assets/layers';
+import type { LayerTreeType } from '$lib/data/layers';
 import {
     filterLayerTree,
     getArrayValidator,
@@ -12,7 +12,7 @@ import {
     SettingInitOnFirstRead,
     storedValue,
     useSettingsStorage,
-} from './setting';
+} from '$lib/state/setting';
 
 /** What the settings were told to keep. */
 let saved: Record<string, string | undefined>;
diff --git a/website/src/lib/logic/setting.ts b/website/src/lib/state/setting.ts
similarity index 98%
rename from website/src/lib/logic/setting.ts
rename to website/src/lib/state/setting.ts
index 34c252605..4b51dd80c 100644
--- a/website/src/lib/logic/setting.ts
+++ b/website/src/lib/state/setting.ts
@@ -1,5 +1,5 @@
 import { get, writable, type Writable } from 'svelte/store';
-import type { LayerTreeType } from '$lib/assets/layers';
+import type { LayerTreeType } from '$lib/data/layers';
 
 /** What the settings were saved as, by key: JSON strings (see `Engine.openStorage`). */
 export type StoredSettings = Record<string, string>;
diff --git a/website/src/lib/logic/settings.test.ts b/website/src/lib/state/settings.test.ts
similarity index 98%
rename from website/src/lib/logic/settings.test.ts
rename to website/src/lib/state/settings.test.ts
index dcce3fec0..ea69792d4 100644
--- a/website/src/lib/logic/settings.test.ts
+++ b/website/src/lib/state/settings.test.ts
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import { afterEach, beforeEach, describe, it } from 'node:test';
 import { get } from 'svelte/store';
 import { engine } from '$lib/engine';
-import { settings } from './settings';
+import { settings } from '$lib/state/settings';
 
 /** What the engine was told to keep. */
 let saved: Record<string, string | undefined>;
diff --git a/website/src/lib/logic/settings.ts b/website/src/lib/state/settings.ts
similarity index 98%
rename from website/src/lib/logic/settings.ts
rename to website/src/lib/state/settings.ts
index eb85de47b..709d5951f 100644
--- a/website/src/lib/logic/settings.ts
+++ b/website/src/lib/state/settings.ts
@@ -11,9 +11,9 @@ import {
     overpassTree,
     type CustomLayer,
     type LayerTreeType,
-} from '$lib/assets/layers';
+} from '$lib/data/layers';
 import { browser } from '$app/environment';
-import type { DistanceUnits, TemperatureUnits, VelocityUnits } from '$lib/unit-conversions';
+import type { DistanceUnits, TemperatureUnits, VelocityUnits } from '$lib/units/conversions';
 import { engine } from '$lib/engine';
 import {
     getArrayValidator,
@@ -24,7 +24,7 @@ import {
     SettingInitOnFirstRead,
     useSettingsStorage,
     type StoredSettings,
-} from './setting';
+} from '$lib/state/setting';
 
 export type { StoredSettings };
 
diff --git a/website/src/lib/cached-fetch.test.ts b/website/src/lib/storage/cached-fetch.test.ts
similarity index 98%
rename from website/src/lib/cached-fetch.test.ts
rename to website/src/lib/storage/cached-fetch.test.ts
index d1f41df17..dc37a23af 100644
--- a/website/src/lib/cached-fetch.test.ts
+++ b/website/src/lib/storage/cached-fetch.test.ts
@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import { afterEach, beforeEach, describe, it, mock } from 'node:test';
-import { cachedFetch, pruneCache } from './cached-fetch';
+import { cachedFetch, pruneCache } from '$lib/storage/cached-fetch';
 
 const keyOf = (request: RequestInfo | URL) =>
     request instanceof Request ? request.url : String(request);
diff --git a/website/src/lib/cached-fetch.ts b/website/src/lib/storage/cached-fetch.ts
similarity index 100%
rename from website/src/lib/cached-fetch.ts
rename to website/src/lib/storage/cached-fetch.ts
diff --git a/website/src/lib/legacy-import.test.ts b/website/src/lib/storage/legacy-import.test.ts
similarity index 98%
rename from website/src/lib/legacy-import.test.ts
rename to website/src/lib/storage/legacy-import.test.ts
index e3a722ae0..efe354498 100644
--- a/website/src/lib/legacy-import.test.ts
+++ b/website/src/lib/storage/legacy-import.test.ts
@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import { legacyFileToGPX, LEGACY_IMPORTED_KEY } from './legacy-import';
+import { legacyFileToGPX, LEGACY_IMPORTED_KEY } from '$lib/storage/legacy-import';
 
 // A file as the former `gpx` library kept it.
 const point = (lat: number, lon: number, extra: Record<string, unknown> = {}) => ({
diff --git a/website/src/lib/legacy-import.ts b/website/src/lib/storage/legacy-import.ts
similarity index 100%
rename from website/src/lib/legacy-import.ts
rename to website/src/lib/storage/legacy-import.ts
diff --git a/website/src/lib/unit-conversions.test.ts b/website/src/lib/units/conversions.test.ts
similarity index 99%
rename from website/src/lib/unit-conversions.test.ts
rename to website/src/lib/units/conversions.test.ts
index 745cffd2d..846cc8a52 100644
--- a/website/src/lib/unit-conversions.test.ts
+++ b/website/src/lib/units/conversions.test.ts
@@ -14,7 +14,7 @@ import {
     milesToKilometers,
     nauticalMilesToKilometers,
     secondsToHHMMSS,
-} from './unit-conversions';
+} from '$lib/units/conversions';
 
 const close = (actual: number, expected: number, epsilon = 1e-9) =>
     assert.ok(Math.abs(actual - expected) < epsilon, `${actual} is not ${expected}`);
diff --git a/website/src/lib/unit-conversions.ts b/website/src/lib/units/conversions.ts
similarity index 100%
rename from website/src/lib/unit-conversions.ts
rename to website/src/lib/units/conversions.ts
diff --git a/website/src/lib/units.ts b/website/src/lib/units/units.ts
similarity index 96%
rename from website/src/lib/units.ts
rename to website/src/lib/units/units.ts
index 47279b0b0..c649758f2 100644
--- a/website/src/lib/units.ts
+++ b/website/src/lib/units/units.ts
@@ -1,5 +1,5 @@
-import { settings } from '$lib/logic/settings';
-import { i18n } from '$lib/i18n.svelte';
+import { settings } from '$lib/state/settings';
+import { i18n } from '$lib/i18n/i18n.svelte';
 import { get } from 'svelte/store';
 import {
     convertDistance,
@@ -8,9 +8,9 @@ import {
     convertTemperature,
     convertVelocity,
     secondsToHHMMSS,
-} from '$lib/unit-conversions';
+} from '$lib/units/conversions';
 
-export * from '$lib/unit-conversions';
+export * from '$lib/units/conversions';
 
 const { distanceUnits, velocityUnits, temperatureUnits } = settings;
 
diff --git a/website/src/lib/utils.ts b/website/src/lib/utils.ts
index 787853e52..c176a8082 100644
--- a/website/src/lib/utils.ts
+++ b/website/src/lib/utils.ts
@@ -1,8 +1,8 @@
 import { clsx, type ClassValue } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 import { base } from '$app/paths';
-import { languages } from '$lib/languages';
-import type { Coordinates } from '$lib/geo';
+import { languages } from '$lib/i18n/languages';
+import type { Coordinates } from '$lib/geo/coordinates';
 import maplibregl from 'maplibre-gl';
 import { pointToTile, pointToTileFraction } from '@mapbox/tilebelt';
 
diff --git a/website/src/routes/+layout.svelte b/website/src/routes/+layout.svelte
index 9522a8af8..9e26b88ea 100644
--- a/website/src/routes/+layout.svelte
+++ b/website/src/routes/+layout.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
     import '../app.css';
     import { ModeWatcher } from 'mode-watcher';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { page } from '$app/state';
     import Nav from '$lib/components/Nav.svelte';
     import Footer from '$lib/components/Footer.svelte';
     import { onMount, type Snippet } from 'svelte';
     import { convertOldEmbeddingOptions } from '$lib/components/embedding/embedding';
     import { base } from '$app/paths';
-    import { languages } from '$lib/languages';
+    import { languages } from '$lib/i18n/languages';
     import { browser } from '$app/environment';
     import { goto } from '$app/navigation';
     import { getURLForLanguage } from '$lib/utils';
diff --git a/website/src/routes/404/+page.svelte b/website/src/routes/404/+page.svelte
index 116d72350..2af0b2fc4 100644
--- a/website/src/routes/404/+page.svelte
+++ b/website/src/routes/404/+page.svelte
@@ -3,7 +3,7 @@
     import Logo from '$lib/components/Logo.svelte';
     import { getURLForLanguage } from '$lib/utils';
     import { House, Map, BookOpenText } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
 </script>
 
 <div class="grow px-12 my-12 flex flex-col items-center justify-center gap-6">
diff --git a/website/src/routes/[[language]]/+page.server.ts b/website/src/routes/[[language]]/+page.server.ts
index 67fb17aed..6f4d75815 100644
--- a/website/src/routes/[[language]]/+page.server.ts
+++ b/website/src/routes/[[language]]/+page.server.ts
@@ -1,4 +1,4 @@
-import { languages } from '$lib/languages';
+import { languages } from '$lib/i18n/languages';
 import type { EntryGenerator } from './$types';
 
 export const entries: EntryGenerator = () => {
diff --git a/website/src/routes/[[language]]/+page.svelte b/website/src/routes/[[language]]/+page.svelte
index 45f8e07b9..af88b81ce 100644
--- a/website/src/routes/[[language]]/+page.svelte
+++ b/website/src/routes/[[language]]/+page.svelte
@@ -16,8 +16,8 @@
         Languages,
         ExternalLink,
     } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
-    import { exampleStatistics } from '$lib/assets/example';
+    import { i18n } from '$lib/i18n/i18n.svelte';
+    import { exampleStatistics } from '$lib/data/example';
     import { getURLForLanguage } from '$lib/utils';
     import { writable } from 'svelte/store';
     import Scissors from '$lib/components/toolbar/tools/scissors/Scissors.svelte';
diff --git a/website/src/routes/[[language]]/app/+page.server.ts b/website/src/routes/[[language]]/app/+page.server.ts
index 67fb17aed..6f4d75815 100644
--- a/website/src/routes/[[language]]/app/+page.server.ts
+++ b/website/src/routes/[[language]]/app/+page.server.ts
@@ -1,4 +1,4 @@
-import { languages } from '$lib/languages';
+import { languages } from '$lib/i18n/languages';
 import type { EntryGenerator } from './$types';
 
 export const entries: EntryGenerator = () => {
diff --git a/website/src/routes/[[language]]/app/+page.svelte b/website/src/routes/[[language]]/app/+page.svelte
index c8d897db7..ed9e5a4e4 100644
--- a/website/src/routes/[[language]]/app/+page.svelte
+++ b/website/src/routes/[[language]]/app/+page.svelte
@@ -12,12 +12,12 @@
     import Resizer from '$lib/components/Resizer.svelte';
     import { Toaster } from '$lib/components/ui/sonner';
     import * as AlertDialog from '$lib/components/ui/alert-dialog';
-    import { i18n } from '$lib/i18n.svelte';
-    import { settings } from '$lib/logic/settings';
-    import { loadFiles } from '$lib/logic/file-actions';
+    import { i18n } from '$lib/i18n/i18n.svelte';
+    import { settings } from '$lib/state/settings';
+    import { loadFiles } from '$lib/actions/file-actions';
     import { onMount } from 'svelte';
     import { page } from '$app/state';
-    import { hoveredPoint, slicedStatistics } from '$lib/logic/selection-statistics';
+    import { hoveredPoint, slicedStatistics } from '$lib/state/selection-statistics';
     import { engine } from '$lib/engine';
     import { getURLForGoogleDriveFile } from '$lib/components/embedding/embedding';
 
diff --git a/website/src/routes/[[language]]/embed/+page.server.ts b/website/src/routes/[[language]]/embed/+page.server.ts
index 67fb17aed..6f4d75815 100644
--- a/website/src/routes/[[language]]/embed/+page.server.ts
+++ b/website/src/routes/[[language]]/embed/+page.server.ts
@@ -1,4 +1,4 @@
-import { languages } from '$lib/languages';
+import { languages } from '$lib/i18n/languages';
 import type { EntryGenerator } from './$types';
 
 export const entries: EntryGenerator = () => {
diff --git a/website/src/routes/[[language]]/help/+layout.svelte b/website/src/routes/[[language]]/help/+layout.svelte
index bc012963e..5ab0f2602 100644
--- a/website/src/routes/[[language]]/help/+layout.svelte
+++ b/website/src/routes/[[language]]/help/+layout.svelte
@@ -2,7 +2,7 @@
     import { Button } from '$lib/components/ui/button';
     import AlgoliaDocSearch from '$lib/components/AlgoliaDocSearch.svelte';
     import { getURLForLanguage } from '$lib/utils';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { page } from '$app/state';
     import { guides } from '$lib/components/docs/docs';
     import type { Snippet } from 'svelte';
diff --git a/website/src/routes/[[language]]/help/+page.server.ts b/website/src/routes/[[language]]/help/+page.server.ts
index 67fb17aed..6f4d75815 100644
--- a/website/src/routes/[[language]]/help/+page.server.ts
+++ b/website/src/routes/[[language]]/help/+page.server.ts
@@ -1,4 +1,4 @@
-import { languages } from '$lib/languages';
+import { languages } from '$lib/i18n/languages';
 import type { EntryGenerator } from './$types';
 
 export const entries: EntryGenerator = () => {
diff --git a/website/src/routes/[[language]]/help/+page.svelte b/website/src/routes/[[language]]/help/+page.svelte
index 5c977038d..f9b0537a5 100644
--- a/website/src/routes/[[language]]/help/+page.svelte
+++ b/website/src/routes/[[language]]/help/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Button } from '$lib/components/ui/button';
     import { getURLForLanguage } from '$lib/utils';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
     import { guides, guideIcons } from '$lib/components/docs/docs';
 
     let {
diff --git a/website/src/routes/[[language]]/help/[...guide]/+page.server.ts b/website/src/routes/[[language]]/help/[...guide]/+page.server.ts
index 326e70bc1..b153927b3 100644
--- a/website/src/routes/[[language]]/help/[...guide]/+page.server.ts
+++ b/website/src/routes/[[language]]/help/[...guide]/+page.server.ts
@@ -1,4 +1,4 @@
-import { languages } from '$lib/languages';
+import { languages } from '$lib/i18n/languages';
 import { guides } from '$lib/components/docs/docs';
 import type { EntryGenerator } from './$types';
 
diff --git a/website/src/routes/[[language]]/help/[...guide]/+page.svelte b/website/src/routes/[[language]]/help/[...guide]/+page.svelte
index 882993466..f6139ff5a 100644
--- a/website/src/routes/[[language]]/help/[...guide]/+page.svelte
+++ b/website/src/routes/[[language]]/help/[...guide]/+page.svelte
@@ -5,7 +5,7 @@
     import { Button } from '$lib/components/ui/button';
     import { getURLForLanguage } from '$lib/utils';
     import { ChevronLeft, ChevronRight, PenLine, CornerDownRight } from '@lucide/svelte';
-    import { i18n } from '$lib/i18n.svelte';
+    import { i18n } from '$lib/i18n/i18n.svelte';
 
     let { data }: { data: { guideModule: any; guideTitles: Record<string, string> } } = $props();