diff --git a/generate-html.py b/generate-html.py
index 98f8367..f919ed8 100755
--- a/generate-html.py
+++ b/generate-html.py
@@ -506,6 +506,7 @@ url_suffix = pinout.get_setting('url_suffix', '')  # '.html'
 template_main = open('common/page.html'.format(lang)).read()
 template_boards = open('common/boards.html'.format(lang)).read()
 template_footer = open('src/{}/template/footer.html'.format(lang)).read()
+template_footer = open('src/{}/template/footer.html'.format(lang)).read()
 
 pages = {}
 navs = {}
@@ -620,7 +621,7 @@ serve.py will mirror this structure for testing.
 '''
 
 pages['index'] = {}
-pages['index']['rendered_html'] = render_overlay_page({'name': 'Index', 'long_description': load_md('index.md')})
+pages['index']['rendered_html'] = render_overlay_page({'name': 'Index', 'long_description': load_md('/template/index.md')})
 
 default_nav = render_nav('pinout')
 
@@ -629,7 +630,7 @@ navs['index'] = default_nav
 '''
 Add the 404 page if 404.md is present.
 '''
-page404 = load_md('404.md')
+page404 = load_md('/template/404.md')
 if page404 is not None:
     pages['404'] = {}
     pages['404']['rendered_html'] = render_overlay_page({'name': '404', 'long_description': page404})
diff --git a/src/de/404.md b/src/de/template/404.md
similarity index 100%
rename from src/de/404.md
rename to src/de/template/404.md
diff --git a/src/de/index.md b/src/de/template/index.md
similarity index 100%
rename from src/de/index.md
rename to src/de/template/index.md
diff --git a/src/en/404.md b/src/en/template/404.md
similarity index 100%
rename from src/en/404.md
rename to src/en/template/404.md
diff --git a/src/en/index.md b/src/en/template/index.md
similarity index 100%
rename from src/en/index.md
rename to src/en/template/index.md
diff --git a/src/es/404.md b/src/es/template/404.md
similarity index 100%
rename from src/es/404.md
rename to src/es/template/404.md
diff --git a/src/es/index.md b/src/es/template/index.md
similarity index 100%
rename from src/es/index.md
rename to src/es/template/index.md
diff --git a/src/fr/404.md b/src/fr/template/404.md
similarity index 100%
rename from src/fr/404.md
rename to src/fr/template/404.md
diff --git a/src/fr/index.md b/src/fr/template/index.md
similarity index 100%
rename from src/fr/index.md
rename to src/fr/template/index.md
diff --git a/src/it/404.md b/src/it/template/404.md
similarity index 100%
rename from src/it/404.md
rename to src/it/template/404.md
diff --git a/src/it/index.md b/src/it/template/index.md
similarity index 100%
rename from src/it/index.md
rename to src/it/template/index.md
diff --git a/src/tr/404.md b/src/tr/template/404.md
similarity index 100%
rename from src/tr/404.md
rename to src/tr/template/404.md
diff --git a/src/tr/index.md b/src/tr/template/index.md
similarity index 100%
rename from src/tr/index.md
rename to src/tr/template/index.md