diff --git a/src/_includes/layouts/main.njk b/src/_includes/main/base.njk
similarity index 92%
rename from src/_includes/layouts/main.njk
rename to src/_includes/main/base.njk
index 0a05bcb5..1a88286d 100644
--- a/src/_includes/layouts/main.njk
+++ b/src/_includes/main/base.njk
@@ -22,7 +22,7 @@
         {% endif %}
 
         {# CDNs #}
-        {% include "components/cdn.njk" %}
+        {% include "main/cdn.njk" %}
 
         {# Favicon #}
         <link rel="apple-touch-icon" sizes="180x180" href="/assets/favicon/apple-touch-icon.png">
@@ -43,8 +43,8 @@
             <img src="/assets/images/elements/top.svg" alt="">
         </button>
 
-        {% include "components/header.njk" %}
-        {% include "components/navbar.njk" %}
+        {% include "main/header.njk" %}
+        {% include "main/navbar.njk" %}
         <main>
             <!-- <aside class="left-sidebar">
                 Left sidebar content here
@@ -56,6 +56,6 @@
                 Right sidebar content here
             </aside> -->
         </main>
-        {% include "components/footer.njk" %}
+        {% include "main/footer.njk" %}
     </body>
 </html>
\ No newline at end of file
diff --git a/src/_includes/components/cdn.njk b/src/_includes/main/cdn.njk
similarity index 100%
rename from src/_includes/components/cdn.njk
rename to src/_includes/main/cdn.njk
diff --git a/src/_includes/components/footer.njk b/src/_includes/main/footer.njk
similarity index 100%
rename from src/_includes/components/footer.njk
rename to src/_includes/main/footer.njk
diff --git a/src/_includes/components/header.njk b/src/_includes/main/header.njk
similarity index 100%
rename from src/_includes/components/header.njk
rename to src/_includes/main/header.njk
diff --git a/src/_includes/components/navbar.njk b/src/_includes/main/navbar.njk
similarity index 100%
rename from src/_includes/components/navbar.njk
rename to src/_includes/main/navbar.njk
diff --git a/src/_includes/layouts/start.njk b/src/_includes/start/base.njk
similarity index 100%
rename from src/_includes/layouts/start.njk
rename to src/_includes/start/base.njk
diff --git a/src/about.njk b/src/about.njk
index 55deda51..0d12d54a 100644
--- a/src/about.njk
+++ b/src/about.njk
@@ -1,8 +1,8 @@
 ---
-layout: "layouts/main.njk"
+layout: main/base
 title: About
-meta_url: about
-meta_description: About this website and its owner.
+metadata:
+    desc: About this website and its owner.
 ---
 
 <article class="divided-article">
diff --git a/src/home.njk b/src/home.njk
index d85ede27..335af6cd 100644
--- a/src/home.njk
+++ b/src/home.njk
@@ -1,8 +1,8 @@
 ---
-layout: "layouts/main.njk"
+layout: main/base
 title: Home
-meta_url: home
-meta_description: Home page of Leilukin's Hub
+metadata:
+    desc: Home page of Leilukin's Hub.
 ---
 
 <div class="content-container">
diff --git a/src/index.njk b/src/index.njk
index 3d58f8ae..ee441909 100644
--- a/src/index.njk
+++ b/src/index.njk
@@ -1,5 +1,5 @@
 ---
-layout: layouts/start
+layout: start/base
 desc: Welcome to Leilukin's personal website.
 h1: Welcome to Leilukin's Hub!
 ---
diff --git a/src/not_found.njk b/src/not_found.njk
index 768b5e77..de515c79 100644
--- a/src/not_found.njk
+++ b/src/not_found.njk
@@ -1,5 +1,5 @@
 ---
-layout: layouts/start
+layout: start/base
 title: Page Not Found
 h1: Page Not Found
 ---
@@ -7,5 +7,5 @@ h1: Page Not Found
 <p>Oops! Either the page you are looking for does not exist, or it has been moved to a diffrent part of this site.</p>
 
 <section class="index__btn-wrapper">
-    <a href="/home.html" class="index__link">🏠 Back to Home</a>
+    <a href="/home" class="index__link">🏠 Back to Home</a>
 </section>
\ No newline at end of file
diff --git a/src/sitemap.njk b/src/sitemap.njk
index 36880143..49c3dd8c 100644
--- a/src/sitemap.njk
+++ b/src/sitemap.njk
@@ -1,9 +1,9 @@
 ---
-layout: layouts/main
+layout: main/base
 title: Site Map
 eleventyExcludeFromCollections: true
-meta_url: sitemap
-meta_description: Site map of Leilukin's Hub.
+metadata:
+    desc: Site map of Leilukin's Hub.
 sitemap: true
 ---