diff --git a/main_site.py b/main_site.py
index d5c68874..4da0f22e 100644
--- a/main_site.py
+++ b/main_site.py
@@ -233,42 +233,42 @@ def render_testimonials_page():
 
 @app.route("/app-form-details")
 def app_form_details():
-    return render_template("app-form-details.html")
+    return render_template("app/form-details.html")
 
 
 @app.route("/app-form")
 def app_form():
-    return render_template("app-form.html")
+    return render_template("app/form.html")
 
 
 @app.route("/app-additional")
 def app_additional():
-    return render_template("app-additional.html")
+    return render_template("app/additional.html")
 
 
 @app.route("/app-household")
 def app_household():
-    return render_template("app-household.html")
+    return render_template("app/household.html")
 
 
 @app.route("/app-long-text")
 def app_long_text():
-    return render_template("app-long-text.html")
+    return render_template("app/long-text.html")
 
 
 @app.route("/app-questionnaire")
 def app_questionnaire():
-    return render_template("app-questionnaire.html")
+    return render_template("app/questionnaire.html")
 
 
 @app.route("/app-reference")
 def app_reference():
-    return render_template("app-reference.html")
+    return render_template("app/reference.html")
 
 
 @app.route("/app-form-admin")
 def app_form_admin():
-    return render_template("app-form-admin.html")
+    return render_template("app/form-admin.html")
 
 
 def get_events():
diff --git a/templates/app-additional.html b/templates/app/additional.html
similarity index 100%
rename from templates/app-additional.html
rename to templates/app/additional.html
diff --git a/templates/app-form-admin.html b/templates/app/form-admin.html
similarity index 100%
rename from templates/app-form-admin.html
rename to templates/app/form-admin.html
diff --git a/templates/app-form-details.html b/templates/app/form-details.html
similarity index 100%
rename from templates/app-form-details.html
rename to templates/app/form-details.html
diff --git a/templates/app-form.html b/templates/app/form.html
similarity index 100%
rename from templates/app-form.html
rename to templates/app/form.html
diff --git a/templates/app-household.html b/templates/app/household.html
similarity index 100%
rename from templates/app-household.html
rename to templates/app/household.html
diff --git a/templates/app-long-text.html b/templates/app/long-text.html
similarity index 100%
rename from templates/app-long-text.html
rename to templates/app/long-text.html
diff --git a/templates/app-questionnaire.html b/templates/app/questionnaire.html
similarity index 100%
rename from templates/app-questionnaire.html
rename to templates/app/questionnaire.html
diff --git a/templates/app-reference.html b/templates/app/reference.html
similarity index 100%
rename from templates/app-reference.html
rename to templates/app/reference.html