diff --git a/server/handlers/pageHandlers.ts b/server/handlers/pageHandlers.ts
index 92854215..2031ea5b 100644
--- a/server/handlers/pageHandlers.ts
+++ b/server/handlers/pageHandlers.ts
@@ -2,13 +2,14 @@
 import { NextApiRequest, NextApiResponse } from "next";
 
 import * as PageUtils from "~/server/utils/pageUtils";
+import { extractFirstQueryValue, reportBadRequest } from "~/server/utils/nextHandlerUtils";
+
 import {
     CreateCommentRequest,
     CreatePageRequest,
     UpdateCommentRequest,
     UpdatePageRequest,
-} from "~/server/types";
-import { extractFirstQueryValue, reportBadRequest } from "~/server/utils/nextHandlerUtils";
+} from "~/types/server";
 
 ///////////
 // PAGES //
diff --git a/server/handlers/siteHandlers.ts b/server/handlers/siteHandlers.ts
index 28ab8429..7d220be7 100644
--- a/server/handlers/siteHandlers.ts
+++ b/server/handlers/siteHandlers.ts
@@ -1,9 +1,10 @@
 import { NextApiRequest, NextApiResponse } from "next";
 
 import * as SiteUtils from "~/server/utils/siteUtils";
-import { CreateSiteRequest, UpdateSiteRequest } from "~/server/types";
 import { extractFirstQueryValue, reportBadRequest } from "~/server/utils/nextHandlerUtils";
 
+import { CreateSiteRequest, UpdateSiteRequest } from "~/types/server";
+
 export async function getSite(req: NextApiRequest, res: NextApiResponse) {
     const { siteId } = extractFirstQueryValue(req);
     try {
diff --git a/server/middlewares/removeProps/index.ts b/server/middlewares/removeProps/index.ts
index 3f2cecf8..39488672 100644
--- a/server/middlewares/removeProps/index.ts
+++ b/server/middlewares/removeProps/index.ts
@@ -1,8 +1,8 @@
 /**
  * This module provides middlewares to remove ALL redudant properties of an object.
  */
-import { KeyNameSet } from "~/server/types";
-import { INextApiMiddleware } from "~/server/types/nextApi.type";
+import { KeyNameSet } from "~/types/server";
+import { INextApiMiddleware } from "~/types/server/nextApi.type";
 
 export function _createRemovePropsMiddleware<T>(allowed: KeyNameSet<T>) {
     const allowedNames = allowed as Set<string>;
diff --git a/server/middlewares/removeProps/sites.ts b/server/middlewares/removeProps/sites.ts
index 5aef54a4..022353d3 100644
--- a/server/middlewares/removeProps/sites.ts
+++ b/server/middlewares/removeProps/sites.ts
@@ -1,4 +1,4 @@
-import { CreateSiteRequest, KeyName, KeyNameSet, UpdateSiteRequest } from "~/server/types";
+import { CreateSiteRequest, KeyName, KeyNameSet, UpdateSiteRequest } from "~/types/server";
 
 import { _createRemovePropsMiddleware } from ".";
 
diff --git a/server/middlewares/validateRequests.ts b/server/middlewares/validateRequests.ts
index ef76fbc4..5cb6c54e 100644
--- a/server/middlewares/validateRequests.ts
+++ b/server/middlewares/validateRequests.ts
@@ -1,7 +1,8 @@
-import { INextApiMiddleware } from "~/server/types/nextApi.type";
 import { verifyJWT, verifySessionCookie } from "~/server/utils/authUtils";
 import { extractFirstQueryValue, reportBadRequest } from "~/server/utils/nextHandlerUtils";
 
+import { INextApiMiddleware } from "~/types/server/nextApi.type";
+
 /**
  * Middleware that checks whether the current user's uid and the targeted document's uid match.
  *
diff --git a/server/utils/pageUtils.ts b/server/utils/pageUtils.ts
index 26b927b9..c1f963b5 100644
--- a/server/utils/pageUtils.ts
+++ b/server/utils/pageUtils.ts
@@ -1,11 +1,12 @@
 import { firestoreAdmin } from "~/server/firebase/firebaseAdmin";
+
 import {
     Comment,
     CreateCommentRequest,
     CreatePageRequest,
     UpdateCommentRequest,
     UpdatePageRequest,
-} from "~/server/types";
+} from "~/types/server";
 
 import { deleteCollection } from "./firestoreUtils";
 
diff --git a/server/utils/siteUtils.ts b/server/utils/siteUtils.ts
index 09bfc9ad..eda6f80d 100644
--- a/server/utils/siteUtils.ts
+++ b/server/utils/siteUtils.ts
@@ -1,6 +1,7 @@
 // TODO: Fix sites and pages models
 import { firestoreAdmin } from "~/server/firebase/firebaseAdmin";
-import { CreateSiteRequest, UpdateSiteRequest } from "~/server/types";
+
+import { CreateSiteRequest, UpdateSiteRequest } from "~/types/server";
 
 import { deleteQuery } from "./firestoreUtils";
 
diff --git a/server/types/comment.type.ts b/types/server/comment.type.ts
similarity index 100%
rename from server/types/comment.type.ts
rename to types/server/comment.type.ts
diff --git a/server/types/index.ts b/types/server/index.ts
similarity index 100%
rename from server/types/index.ts
rename to types/server/index.ts
diff --git a/server/types/nextApi.type.ts b/types/server/nextApi.type.ts
similarity index 100%
rename from server/types/nextApi.type.ts
rename to types/server/nextApi.type.ts
diff --git a/server/types/page.type.ts b/types/server/page.type.ts
similarity index 100%
rename from server/types/page.type.ts
rename to types/server/page.type.ts
diff --git a/server/types/site.type.ts b/types/server/site.type.ts
similarity index 100%
rename from server/types/site.type.ts
rename to types/server/site.type.ts