diff --git a/hugo.toml b/hugo.toml
index 0295cfe..07f9188 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -10,31 +10,34 @@ source = "content"
 target = "content"
 excludeFiles = "uninotes/subjectcode/**"
 [[module.mounts]]
-source = "changelog"
+source = "pages/homepage"
+target = "content"
+[[module.mounts]]
+source = "pages/changelog"
 target = "content/changelog"
 [[module.mounts]]
-source = "terms"
+source = "pages/terms"
 target = "content/terms"
 [[module.mounts]]
-source = "privacy"
+source = "pages/privacy"
 target = "content/privacy"
 [[module.mounts]]
-source = "search-results"
+source = "pages/search-results"
 target = "content/search-results"
 [[module.mounts]]
-source = "coming-soon"
+source = "pages/coming-soon"
 target = "content/coming-soon"
 [[module.mounts]]
-source = "contact"
+source = "pages/contact"
 target = "content/contact"
 [[module.mounts]]
-source = "login"
+source = "pages/login"
 target = "content/login"
 [[module.mounts]]
-source = "signup"
+source = "pages/signup"
 target = "content/signup"
 [[module.mounts]]
-source = "admin"
+source = "pages/admin"
 target = "content/admin"
 [[module.mounts]]
 source = "content/uninotes/subjectcode"
diff --git a/admin/index.md b/pages/admin/index.md
similarity index 100%
rename from admin/index.md
rename to pages/admin/index.md
diff --git a/changelog/_index.md b/pages/changelog/_index.md
similarity index 100%
rename from changelog/_index.md
rename to pages/changelog/_index.md
diff --git a/coming-soon/index.md b/pages/coming-soon/index.md
similarity index 100%
rename from coming-soon/index.md
rename to pages/coming-soon/index.md
diff --git a/contact/index.md b/pages/contact/index.md
similarity index 100%
rename from contact/index.md
rename to pages/contact/index.md
diff --git a/content/_index.md b/pages/homepage/_index.md
similarity index 100%
rename from content/_index.md
rename to pages/homepage/_index.md
diff --git a/login/index.md b/pages/login/index.md
similarity index 100%
rename from login/index.md
rename to pages/login/index.md
diff --git a/privacy/_index.md b/pages/privacy/_index.md
similarity index 100%
rename from privacy/_index.md
rename to pages/privacy/_index.md
diff --git a/search-results/_index.md b/pages/search-results/_index.md
similarity index 100%
rename from search-results/_index.md
rename to pages/search-results/_index.md
diff --git a/signup/index.md b/pages/signup/index.md
similarity index 100%
rename from signup/index.md
rename to pages/signup/index.md
diff --git a/terms/_index.md b/pages/terms/_index.md
similarity index 100%
rename from terms/_index.md
rename to pages/terms/_index.md