diff --git a/src/App.svelte b/src/App.svelte
index 382a262..0a9f00e 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -6,7 +6,7 @@
   import WorldMap from './lib/world-map/WorldMap.svelte';
   import JourneyView from './lib/world-map/JourneyView.svelte';
   import StatsPanel from './lib/world-map/StatsPanel.svelte';
-  import TimelineView from './lib/timeline/TimelineView.svelte';
+  import TimelineView from './lib/timeline/view/TimelineView.svelte';
 
   let screen = $state('worldmap');
   let journeyActive = $state(false);
diff --git a/src/assets 2/home.png b/src/assets/home.png
similarity index 100%
rename from src/assets 2/home.png
rename to src/assets/home.png
diff --git a/src/lib/auth/CountryPicker.svelte b/src/lib/auth/CountryPicker.svelte
index 754b5bc..ea307a1 100644
--- a/src/lib/auth/CountryPicker.svelte
+++ b/src/lib/auth/CountryPicker.svelte
@@ -1,7 +1,7 @@
 <script>
   import { getUser, getUserProfile, setHomeCountry } from './userStore.svelte.js';
   import { countryNames } from '../shared/countries.js';
-  import homeImg from '../../assets 2/home.png';
+  import homeImg from '../../assets/home.png';
 
   let user = $derived(getUser());
   let profile = $derived(getUserProfile());
diff --git a/src/lib/timeline/DeleteConfirm.svelte b/src/lib/timeline/detail/DeleteConfirm.svelte
similarity index 100%
rename from src/lib/timeline/DeleteConfirm.svelte
rename to src/lib/timeline/detail/DeleteConfirm.svelte
diff --git a/src/lib/timeline/EditForm.svelte b/src/lib/timeline/detail/EditForm.svelte
similarity index 97%
rename from src/lib/timeline/EditForm.svelte
rename to src/lib/timeline/detail/EditForm.svelte
index 19e5e9d..6b68705 100644
--- a/src/lib/timeline/EditForm.svelte
+++ b/src/lib/timeline/detail/EditForm.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { getEntries } from '../stores/entriesStore.svelte.js';
-  import { addEntry, updateEntry } from '../stores/entriesStore.svelte.js';
-  import { countryNames } from '../shared/countries.js';
-  import { getCitiesForCountry, ALL_CITIES } from '../shared/cities.js';
-  import SearchInput from '../shared/SearchInput.svelte';
+  import { getEntries } from '../../stores/entriesStore.svelte.js';
+  import { addEntry, updateEntry } from '../../stores/entriesStore.svelte.js';
+  import { countryNames } from '../../shared/countries.js';
+  import { getCitiesForCountry, ALL_CITIES } from '../../shared/cities.js';
+  import SearchInput from '../../shared/SearchInput.svelte';
   import PhotoEditor from './PhotoEditor.svelte';
 
   /**
diff --git a/src/lib/timeline/JournalDetail.svelte b/src/lib/timeline/detail/JournalDetail.svelte
similarity index 98%
rename from src/lib/timeline/JournalDetail.svelte
rename to src/lib/timeline/detail/JournalDetail.svelte
index 0a3bbaa..8b41543 100644
--- a/src/lib/timeline/JournalDetail.svelte
+++ b/src/lib/timeline/detail/JournalDetail.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { removeEntry } from '../stores/entriesStore.svelte.js';
-  import { flagEmoji } from '../shared/countries.js';
+  import { removeEntry } from '../../stores/entriesStore.svelte.js';
+  import { flagEmoji } from '../../shared/countries.js';
   import DeleteConfirm from './DeleteConfirm.svelte';
 
   /** @type {{ entry: import('../shared/types.js').JournalEntry, onBack: () => void, onEdit: () => void }} */
diff --git a/src/lib/timeline/JournalSummary.svelte b/src/lib/timeline/detail/JournalSummary.svelte
similarity index 100%
rename from src/lib/timeline/JournalSummary.svelte
rename to src/lib/timeline/detail/JournalSummary.svelte
diff --git a/src/lib/timeline/NewEntryForm.svelte b/src/lib/timeline/detail/NewEntryForm.svelte
similarity index 96%
rename from src/lib/timeline/NewEntryForm.svelte
rename to src/lib/timeline/detail/NewEntryForm.svelte
index abb19f3..2334bf8 100644
--- a/src/lib/timeline/NewEntryForm.svelte
+++ b/src/lib/timeline/detail/NewEntryForm.svelte
@@ -1,17 +1,17 @@
 <script>
-  import { journals, addJournal } from '../stores/journalStore.js';
+  import { journals, addJournal } from '../../stores/journalStore.js';
   import { get } from 'svelte/store';
-  import { flashCountry } from '../layout/selection.svelte.js';
-  import { countryNames } from '../shared/countries.js';
-  import { countryCities } from '../shared/countryCities.js';
-  import SearchInput from '../shared/SearchInput.svelte';
+  import { flashCountry } from '../../layout/selection.svelte.js';
+  import { countryNames } from '../../shared/countries.js';
+  import { countryCities } from '../../shared/countryCities.js';
+  import SearchInput from '../../shared/SearchInput.svelte';
   import PhotoEditor from './PhotoEditor.svelte';
-  import airplaneImg from '../../assets/airplane.png';
-  import trainImg    from '../../assets/train.png';
-  import busImg      from '../../assets/bus.png';
-  import carImg      from '../../assets/car.png';
-  import shipImg     from '../../assets/ship.png';
-  import walkImg     from '../../assets/walk.png';
+  import airplaneImg from '../../../assets/airplane.png';
+  import trainImg    from '../../../assets/train.png';
+  import busImg      from '../../../assets/bus.png';
+  import carImg      from '../../../assets/car.png';
+  import shipImg     from '../../../assets/ship.png';
+  import walkImg     from '../../../assets/walk.png';
 
   let { initialCountry = '', onBack, onSaved = onBack } = $props();
 
diff --git a/src/lib/timeline/PhotoEditor.svelte b/src/lib/timeline/detail/PhotoEditor.svelte
similarity index 99%
rename from src/lib/timeline/PhotoEditor.svelte
rename to src/lib/timeline/detail/PhotoEditor.svelte
index 0ac7f42..24a4d6d 100644
--- a/src/lib/timeline/PhotoEditor.svelte
+++ b/src/lib/timeline/detail/PhotoEditor.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { storage } from '../firebase.js';
+  import { storage } from '../../firebase.js';
   import { ref, uploadBytes, getDownloadURL } from 'firebase/storage';
 
   /** @type {{ photos: string[], onchange: (photos: string[]) => void }} */
diff --git a/src/lib/timeline/ShareCard.svelte b/src/lib/timeline/view/ShareCard.svelte
similarity index 100%
rename from src/lib/timeline/ShareCard.svelte
rename to src/lib/timeline/view/ShareCard.svelte
diff --git a/src/lib/timeline/SharePreview.svelte b/src/lib/timeline/view/SharePreview.svelte
similarity index 100%
rename from src/lib/timeline/SharePreview.svelte
rename to src/lib/timeline/view/SharePreview.svelte
diff --git a/src/lib/timeline/TimelineCard.svelte b/src/lib/timeline/view/TimelineCard.svelte
similarity index 99%
rename from src/lib/timeline/TimelineCard.svelte
rename to src/lib/timeline/view/TimelineCard.svelte
index 9c26ab3..d7cd787 100644
--- a/src/lib/timeline/TimelineCard.svelte
+++ b/src/lib/timeline/view/TimelineCard.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { flagEmoji } from '../shared/countries.js';
+  import { flagEmoji } from '../../shared/countries.js';
 
   /** @type {{ entry: import('../shared/types.js').JournalEntry, onClick: () => void }} */
   let { entry, onClick } = $props();
diff --git a/src/lib/timeline/TimelineToolbar.svelte b/src/lib/timeline/view/TimelineToolbar.svelte
similarity index 100%
rename from src/lib/timeline/TimelineToolbar.svelte
rename to src/lib/timeline/view/TimelineToolbar.svelte
diff --git a/src/lib/timeline/TimelineView.svelte b/src/lib/timeline/view/TimelineView.svelte
similarity index 97%
rename from src/lib/timeline/TimelineView.svelte
rename to src/lib/timeline/view/TimelineView.svelte
index bffb7bd..b1bb5ba 100644
--- a/src/lib/timeline/TimelineView.svelte
+++ b/src/lib/timeline/view/TimelineView.svelte
@@ -1,10 +1,10 @@
 <script>
-  import { getEntries } from '../stores/entriesStore.svelte.js';
+  import { getEntries } from '../../stores/entriesStore.svelte.js';
   import TimelineToolbar from './TimelineToolbar.svelte';
   import TimelineCard from './TimelineCard.svelte';
-  import JournalDetail from './JournalDetail.svelte';
-  import EditForm from './EditForm.svelte';
-  import NewEntryForm from './NewEntryForm.svelte';
+  import JournalDetail from '../detail/JournalDetail.svelte';
+  import EditForm from '../detail/EditForm.svelte';
+  import NewEntryForm from '../detail/NewEntryForm.svelte';
   import ShareCard from './ShareCard.svelte';
   import SharePreview from './SharePreview.svelte';
 
diff --git a/src/lib/world-map/WorldMap.svelte b/src/lib/world-map/WorldMap.svelte
index 14f899c..98f5f22 100644
--- a/src/lib/world-map/WorldMap.svelte
+++ b/src/lib/world-map/WorldMap.svelte
@@ -5,7 +5,7 @@
   import worldData from 'world-atlas/countries-50m.json';
   import { getSelected, setTotalCount, getFlashing } from '../layout/selection.svelte.js';
   import { getUserProfile } from '../auth/userStore.svelte.js';
-  import homeIconUrl from '../../assets 2/home.png';
+  import homeIconUrl from '../../assets/home.png';
   import crayonCursorUrl from '../../assets/logo-cursor.png';
 
   let { onCountryClick = (_name) => {} } = $props();