diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 0dd2df1..3f38f69 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -9,21 +9,17 @@
 		<link rel="stylesheet" href="/light-theme.css">
 		<link rel="shortcut icon" href="/favicon.ico">
 
-		<title>{{ block "title" . }}
-		{{ .Site.Title }}
-		{{ end }}</title>
+		<title>{{ block "title" . }} {{ .Site.Title }} {{ end }}</title>
 	</head>
 
 	<body>
-		{{ partial "navbar/site-navbar.html" . }}
+		{{ partial "navbar.html" . }}
 
 		<main>
-			{{ block "main" . }}
-				<!-- The part of the page that begins to differ between templates -->
-			{{ end }}
+			{{ block "main" . }} {{ end }}
 		</main>
 
-		{{ partial "footer/site-footer.html" . }}
+		{{ partial "footer.html" . }}
 		{{ partial "scripts/scripts.html" . }}
 	</body>
 </html>
diff --git a/layouts/partials/footer/site-footer.html b/layouts/partials/footer.html
similarity index 100%
rename from layouts/partials/footer/site-footer.html
rename to layouts/partials/footer.html
diff --git a/layouts/partials/navbar/site-navbar.html b/layouts/partials/navbar.html
similarity index 100%
rename from layouts/partials/navbar/site-navbar.html
rename to layouts/partials/navbar.html
