diff --git a/portfolio/en/japan.html b/portfolio/en/japan.html
index 7ed0958..d859249 100644
--- a/portfolio/en/japan.html
+++ b/portfolio/en/japan.html
@@ -6,4 +6,4 @@ language: "en"
 
 <p>These pages contain my notes on learning about the Japanese language and culture.</p>
 
-$partial("templates/japan-language-notes.html")$
+$partial("templates/japan/main-page.html")$
diff --git a/portfolio/jp/japan.html b/portfolio/jp/japan.html
index 5ddaeac..5d21003 100644
--- a/portfolio/jp/japan.html
+++ b/portfolio/jp/japan.html
@@ -7,4 +7,4 @@ language: "jp"
 <p>これらのページには、日本語と言語文化に関する私のメモが含まれています。</p>
 <p>これらのページは英語のみで提供されています。</p>
 
-$partial("templates/japan-language-notes.html")$
+$partial("templates/japan/main-page.html")$
diff --git a/portfolio/nl/japan.html b/portfolio/nl/japan.html
index c19b858..4bea484 100644
--- a/portfolio/nl/japan.html
+++ b/portfolio/nl/japan.html
@@ -7,4 +7,4 @@ language: "nl"
 <p>Deze paginas bevatten mijn notities om de Japanse taal en cultuur te bestuderen.</p>
 <p>Alle paginas zijn alleen in het Engels.</p>
 
-$partial("templates/japan-language-notes.html")$
+$partial("templates/japan/main-page.html")$
diff --git a/portfolio/site.hs b/portfolio/site.hs
index 8ec5004..5990221 100644
--- a/portfolio/site.hs
+++ b/portfolio/site.hs
@@ -64,7 +64,7 @@ main = hakyll $ do
             let lang = fromMaybe "en" language
 
             pandocCompiler
-                >>= loadAndApplyTemplate "templates/japan-language-note.html"   (postCtx lang)
+                >>= loadAndApplyTemplate "templates/japan/language-note.html"   (postCtx lang)
                 >>= loadAndApplyTemplate "templates/default.html" (postCtx lang)
                 >>= relativizeUrls
 
diff --git a/portfolio/templates/japan-language-note.html b/portfolio/templates/japan/language-note.html
similarity index 100%
rename from portfolio/templates/japan-language-note.html
rename to portfolio/templates/japan/language-note.html
diff --git a/portfolio/templates/japan-language-notes.html b/portfolio/templates/japan/main-page.html
similarity index 100%
rename from portfolio/templates/japan-language-notes.html
rename to portfolio/templates/japan/main-page.html