diff --git a/pkg/contacts.go b/pkg/contacts.go
index 5e30bd1..20d6b65 100644
--- a/pkg/contacts.go
+++ b/pkg/contacts.go
@@ -25,7 +25,7 @@ func IndexContacts(w http.ResponseWriter, r *http.Request, _ httprouter.Params)
 	page := &ContactsIndexPage{
 		Contacts: mustGetContactEntries(r.Context(), conn, company),
 	}
-	mustRenderAppTemplate(w, r, "contacts-index.gohtml", page)
+	mustRenderAppTemplate(w, r, "contacts/index.gohtml", page)
 }
 
 func GetContactForm(w http.ResponseWriter, r *http.Request, params httprouter.Params) {
@@ -52,11 +52,11 @@ func GetContactForm(w http.ResponseWriter, r *http.Request, params httprouter.Pa
 }
 
 func mustRenderNewContactForm(w http.ResponseWriter, r *http.Request, form *contactForm) {
-	mustRenderAppTemplate(w, r, "contacts-new.gohtml", form)
+	mustRenderAppTemplate(w, r, "contacts/new.gohtml", form)
 }
 
 func mustRenderEditContactForm(w http.ResponseWriter, r *http.Request, form *contactForm) {
-	mustRenderAppTemplate(w, r, "contacts-edit.gohtml", form)
+	mustRenderAppTemplate(w, r, "contacts/edit.gohtml", form)
 }
 
 func HandleAddContact(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
diff --git a/web/template/contacts-edit.gohtml b/web/template/contacts/edit.gohtml
similarity index 100%
rename from web/template/contacts-edit.gohtml
rename to web/template/contacts/edit.gohtml
diff --git a/web/template/contacts-index.gohtml b/web/template/contacts/index.gohtml
similarity index 100%
rename from web/template/contacts-index.gohtml
rename to web/template/contacts/index.gohtml
diff --git a/web/template/contacts-new.gohtml b/web/template/contacts/new.gohtml
similarity index 100%
rename from web/template/contacts-new.gohtml
rename to web/template/contacts/new.gohtml