diff --git a/assets/diary/diary-calendar.html b/assets/diary/calendar.html
similarity index 96%
rename from assets/diary/diary-calendar.html
rename to assets/diary/calendar.html
index a76c430..d108cd9 100644
--- a/assets/diary/diary-calendar.html
+++ b/assets/diary/calendar.html
@@ -26,4 +26,4 @@
     </tbody>
   </table>
 </div>
-<script src="/_/diary/diary-calendar.js"></script>
+<script src="/_/diary/calendar.js"></script>
diff --git a/assets/diary/diary-calendar.js b/assets/diary/calendar.js
similarity index 100%
rename from assets/diary/diary-calendar.js
rename to assets/diary/calendar.js
diff --git a/assets/diary/diary-day.html b/assets/diary/day.html
similarity index 100%
rename from assets/diary/diary-day.html
rename to assets/diary/day.html
diff --git a/assets/diary/diary-month.html b/assets/diary/month.html
similarity index 100%
rename from assets/diary/diary-month.html
rename to assets/diary/month.html
diff --git a/assets/diary/diary-year.html b/assets/diary/year.html
similarity index 100%
rename from assets/diary/diary-year.html
rename to assets/diary/year.html
diff --git a/assets/edit.html b/assets/editor/main.html
similarity index 98%
rename from assets/edit.html
rename to assets/editor/main.html
index f9eaaed..4dd0c30 100644
--- a/assets/edit.html
+++ b/assets/editor/main.html
@@ -35,5 +35,5 @@
 <script src="/_/editor/tables.js"></script>
 <script src="/_/editor/dates.js"></script>
 <script src="/_/editor/movie.js"></script>
-<script src="/_/editor.js"></script>
+<script src="/_/editor/main.js"></script>
 {{end}}
diff --git a/assets/editor.js b/assets/editor/main.js
similarity index 100%
rename from assets/editor.js
rename to assets/editor/main.js
diff --git a/assets/page-actions.js b/assets/page/actions.js
similarity index 100%
rename from assets/page-actions.js
rename to assets/page/actions.js
diff --git a/assets/anchors.js b/assets/page/anchors.js
similarity index 100%
rename from assets/anchors.js
rename to assets/page/anchors.js
diff --git a/assets/content.js b/assets/page/content.js
similarity index 100%
rename from assets/content.js
rename to assets/page/content.js
diff --git a/assets/page.html b/assets/page/main.html
similarity index 83%
rename from assets/page.html
rename to assets/page/main.html
index 9f2403e..e92fafb 100644
--- a/assets/page.html
+++ b/assets/page/main.html
@@ -1,4 +1,4 @@
-{{define "headScripts"}}<script src="/_/page-actions.js"></script>{{end}}
+{{define "headScripts"}}<script src="/_/page/actions.js"></script>{{end}}
 
 {{define "content"}}
 {{if .Content}}
@@ -24,13 +24,13 @@
 {{end}}
 {{end}}
 {{if or .Content .SpecialContent}}
-<script src="/_/content.js"></script>
-<script src="/_/anchors.js"></script>
-<script src="/_/toc.js"></script>
-<script src="/_/tasks.js"></script>
+<script src="/_/page/content.js"></script>
+<script src="/_/page/anchors.js"></script>
+<script src="/_/page/toc.js"></script>
+<script src="/_/page/tasks.js"></script>
 {{end}}
 {{if .Content}}
-<script src="/_/sections.js"></script>
+<script src="/_/page/sections.js"></script>
 {{end}}
 {{end}}
 
diff --git a/assets/sections.js b/assets/page/sections.js
similarity index 100%
rename from assets/sections.js
rename to assets/page/sections.js
diff --git a/assets/tasks.js b/assets/page/tasks.js
similarity index 100%
rename from assets/tasks.js
rename to assets/page/tasks.js
diff --git a/assets/toc.js b/assets/page/toc.js
similarity index 100%
rename from assets/toc.js
rename to assets/page/toc.js
diff --git a/assets/search-actions.js b/assets/search/actions.js
similarity index 100%
rename from assets/search-actions.js
rename to assets/search/actions.js
diff --git a/assets/search.html b/assets/search/main.html
similarity index 94%
rename from assets/search.html
rename to assets/search/main.html
index 7abe5e0..7330a6a 100644
--- a/assets/search.html
+++ b/assets/search/main.html
@@ -1,4 +1,4 @@
-{{define "headScripts"}}<script src="/_/search-actions.js"></script>{{end}}
+{{define "headScripts"}}<script src="/_/search/actions.js"></script>{{end}}
 
 {{define "searchQuery"}}{{.Query}}{{end}}
 
diff --git a/diary.go b/diary.go
index 7c69cf2..1377283 100644
--- a/diary.go
+++ b/diary.go
@@ -102,7 +102,7 @@ type calendarData struct {
 	AllMonths    []calMonth
 }
 
-var diaryCalTmpl = template.Must(template.ParseFS(assets, "assets/diary/diary-calendar.html"))
+var diaryCalTmpl = template.Must(template.ParseFS(assets, "assets/diary/calendar.html"))
 
 func computeCalendarWidget(diaryRootFS, diaryRootURL, fsPath string, depth int) template.HTML {
 	today := time.Now()
@@ -312,9 +312,9 @@ type diaryYearData struct {
 type diaryMonthData struct{ Days []diaryDaySection }
 type diaryDayData struct{ Photos []diaryPhoto }
 
-var diaryYearTmpl = template.Must(template.ParseFS(assets, "assets/diary/diary-year.html"))
-var diaryMonthTmpl = template.Must(template.ParseFS(assets, "assets/diary/diary-month.html"))
-var diaryDayTmpl = template.Must(template.ParseFS(assets, "assets/diary/diary-day.html"))
+var diaryYearTmpl = template.Must(template.ParseFS(assets, "assets/diary/year.html"))
+var diaryMonthTmpl = template.Must(template.ParseFS(assets, "assets/diary/month.html"))
+var diaryDayTmpl = template.Must(template.ParseFS(assets, "assets/diary/day.html"))
 
 var germanWeekdays = map[time.Weekday]string{
 	time.Sunday:    "Sonntag",
diff --git a/main.go b/main.go
index bcf2bb0..862e189 100644
--- a/main.go
+++ b/main.go
@@ -20,9 +20,9 @@ import (
 var assets embed.FS
 
 var (
-	pageTmpl   = template.Must(template.ParseFS(assets, "assets/layout.html", "assets/page.html"))
-	editTmpl   = template.Must(template.ParseFS(assets, "assets/layout.html", "assets/edit.html"))
-	searchTmpl = template.Must(template.ParseFS(assets, "assets/layout.html", "assets/search.html"))
+	pageTmpl   = template.Must(template.ParseFS(assets, "assets/layout.html", "assets/page/main.html"))
+	editTmpl   = template.Must(template.ParseFS(assets, "assets/layout.html", "assets/editor/main.html"))
+	searchTmpl = template.Must(template.ParseFS(assets, "assets/layout.html", "assets/search/main.html"))
 )
 
 // specialPage is the result returned by a pageTypeHandler.