diff --git a/.gitignore b/.gitignore
index ebf2039ec..a0420fec9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .vite
 .vscode
 *.sh
-!uptime.sh
\ No newline at end of file
+!uptime.sh
+*.idea
\ No newline at end of file
diff --git a/Server/db/FakeDb.js b/Server/db/FakeDb.js
index e4f36d001..a7c8bf4ee 100644
--- a/Server/db/FakeDb.js
+++ b/Server/db/FakeDb.js
@@ -20,8 +20,8 @@
 // The rest of the code is the same, as all the `db` methods are standardized.
 // **************************
 
-const Monitor = require("../models/Monitor");
-const UserModel = require("../models/User");
+const Monitor = require("./models/Monitor");
+const UserModel = require("./models/User");
 const bcrypt = require("bcrypt");
 
 let FAKE_MONITOR_DATA = [];
diff --git a/Server/models/AppSettings.js b/Server/db/models/AppSettings.js
similarity index 100%
rename from Server/models/AppSettings.js
rename to Server/db/models/AppSettings.js
diff --git a/Server/models/Check.js b/Server/db/models/Check.js
similarity index 93%
rename from Server/models/Check.js
rename to Server/db/models/Check.js
index acb20dfb9..7705ba3fd 100644
--- a/Server/models/Check.js
+++ b/Server/db/models/Check.js
@@ -1,6 +1,6 @@
 const mongoose = require("mongoose");
-const EmailService = require("../service/emailService");
-const Notification = require("../models/Notification");
+const EmailService = require("../../service/emailService");
+const Notification = require("./Notification");
 
 /**
  * Check Schema for MongoDB collection.
diff --git a/Server/models/InviteToken.js b/Server/db/models/InviteToken.js
similarity index 100%
rename from Server/models/InviteToken.js
rename to Server/db/models/InviteToken.js
diff --git a/Server/models/MaintenanceWindow.js b/Server/db/models/MaintenanceWindow.js
similarity index 100%
rename from Server/models/MaintenanceWindow.js
rename to Server/db/models/MaintenanceWindow.js
diff --git a/Server/models/Monitor.js b/Server/db/models/Monitor.js
similarity index 100%
rename from Server/models/Monitor.js
rename to Server/db/models/Monitor.js
diff --git a/Server/models/Notification.js b/Server/db/models/Notification.js
similarity index 100%
rename from Server/models/Notification.js
rename to Server/db/models/Notification.js
diff --git a/Server/models/PageSpeedCheck.js b/Server/db/models/PageSpeedCheck.js
similarity index 100%
rename from Server/models/PageSpeedCheck.js
rename to Server/db/models/PageSpeedCheck.js
diff --git a/Server/models/RecoveryToken.js b/Server/db/models/RecoveryToken.js
similarity index 100%
rename from Server/models/RecoveryToken.js
rename to Server/db/models/RecoveryToken.js
diff --git a/Server/models/Team.js b/Server/db/models/Team.js
similarity index 100%
rename from Server/models/Team.js
rename to Server/db/models/Team.js
diff --git a/Server/models/User.js b/Server/db/models/User.js
similarity index 100%
rename from Server/models/User.js
rename to Server/db/models/User.js
diff --git a/Server/db/mongo/MongoDB.js b/Server/db/mongo/MongoDB.js
index 268e62798..aeb993433 100644
--- a/Server/db/mongo/MongoDB.js
+++ b/Server/db/mongo/MongoDB.js
@@ -1,6 +1,6 @@
 const mongoose = require("mongoose");
-const UserModel = require("../../models/User");
-const AppSettings = require("../../models/AppSettings");
+const UserModel = require("../models/User");
+const AppSettings = require("../models/AppSettings");
 
 //****************************************
 // DB Connection
diff --git a/Server/db/mongo/modules/checkModule.js b/Server/db/mongo/modules/checkModule.js
index c18491021..193d793c6 100644
--- a/Server/db/mongo/modules/checkModule.js
+++ b/Server/db/mongo/modules/checkModule.js
@@ -1,6 +1,6 @@
-const Check = require("../../../models/Check");
-const Monitor = require("../../../models/Monitor");
-const User = require("../../../models/User");
+const Check = require("../../models/Check");
+const Monitor = require("../../models/Monitor");
+const User = require("../../models/User");
 const logger = require("../../../utils/logger");
 const SERVICE_NAME = "checkModule";
 const dateRangeLookup = {
diff --git a/Server/db/mongo/modules/inviteModule.js b/Server/db/mongo/modules/inviteModule.js
index 9a0d35621..8152941d7 100644
--- a/Server/db/mongo/modules/inviteModule.js
+++ b/Server/db/mongo/modules/inviteModule.js
@@ -1,4 +1,4 @@
-const InviteToken = require("../../../models/InviteToken");
+const InviteToken = require("../../models/InviteToken");
 const crypto = require("crypto");
 const { errorMessages } = require("../../../utils/messages");
 const SERVICE_NAME = "inviteModule";
diff --git a/Server/db/mongo/modules/maintenaceWindowModule.js b/Server/db/mongo/modules/maintenaceWindowModule.js
index bcb11e816..f49c9dca4 100644
--- a/Server/db/mongo/modules/maintenaceWindowModule.js
+++ b/Server/db/mongo/modules/maintenaceWindowModule.js
@@ -1,4 +1,4 @@
-const MaintenanceWindow = require("../../../models/MaintenanceWindow");
+const MaintenanceWindow = require("../../models/MaintenanceWindow");
 const SERVICE_NAME = "maintenanceWindowModule";
 
 /**
diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js
index 002bf9c41..d1fd0d03e 100644
--- a/Server/db/mongo/modules/monitorModule.js
+++ b/Server/db/mongo/modules/monitorModule.js
@@ -1,8 +1,8 @@
-const Monitor = require("../../../models/Monitor");
-const Check = require("../../../models/Check");
-const PageSpeedCheck = require("../../../models/PageSpeedCheck");
+const Monitor = require("../../models/Monitor");
+const Check = require("../../models/Check");
+const PageSpeedCheck = require("../../models/PageSpeedCheck");
 const { errorMessages } = require("../../../utils/messages");
-const Notification = require("../../../models/Notification");
+const Notification = require("../../models/Notification");
 const { NormalizeData } = require("../../../utils/dataUtils");
 const demoMonitors = require("../../../utils/demoMonitors.json");
 const SERVICE_NAME = "monitorModule";
diff --git a/Server/db/mongo/modules/notificationModule.js b/Server/db/mongo/modules/notificationModule.js
index 89df2130b..ecc52644d 100644
--- a/Server/db/mongo/modules/notificationModule.js
+++ b/Server/db/mongo/modules/notificationModule.js
@@ -1,4 +1,4 @@
-const Notification = require("../../../models/Notification");
+const Notification = require("../../models/Notification");
 const SERVICE_NAME = "notificationModule";
 /**
  * Creates a new notification.
diff --git a/Server/db/mongo/modules/pageSpeedCheckModule.js b/Server/db/mongo/modules/pageSpeedCheckModule.js
index 8b76555c5..a0c7694c8 100644
--- a/Server/db/mongo/modules/pageSpeedCheckModule.js
+++ b/Server/db/mongo/modules/pageSpeedCheckModule.js
@@ -1,4 +1,4 @@
-const PageSpeedCheck = require("../../../models/PageSpeedCheck");
+const PageSpeedCheck = require("../../models/PageSpeedCheck");
 const SERVICE_NAME = "pageSpeedCheckModule";
 /**
  * Create a PageSpeed check for a monitor
diff --git a/Server/db/mongo/modules/recoveryModule.js b/Server/db/mongo/modules/recoveryModule.js
index 469954cef..4649fa084 100644
--- a/Server/db/mongo/modules/recoveryModule.js
+++ b/Server/db/mongo/modules/recoveryModule.js
@@ -1,5 +1,5 @@
-const UserModel = require("../../../models/User");
-const RecoveryToken = require("../../../models/RecoveryToken");
+const UserModel = require("../../models/User");
+const RecoveryToken = require("../../models/RecoveryToken");
 const crypto = require("crypto");
 const { errorMessages } = require("../../../utils/messages");
 const SERVICE_NAME = "recoveryModule";
diff --git a/Server/db/mongo/modules/settingsModule.js b/Server/db/mongo/modules/settingsModule.js
index b7e6b765d..f7cfc9ce1 100644
--- a/Server/db/mongo/modules/settingsModule.js
+++ b/Server/db/mongo/modules/settingsModule.js
@@ -1,4 +1,4 @@
-const AppSettings = require("../../../models/AppSettings");
+const AppSettings = require("../../models/AppSettings");
 const SERVICE_NAME = "SettingsModule";
 
 const getAppSettings = async () => {
diff --git a/Server/db/mongo/modules/userModule.js b/Server/db/mongo/modules/userModule.js
index bfdd54a4c..c72bd7c5d 100644
--- a/Server/db/mongo/modules/userModule.js
+++ b/Server/db/mongo/modules/userModule.js
@@ -1,5 +1,5 @@
-const UserModel = require("../../../models/User");
-const TeamModel = require("../../../models/Team");
+const UserModel = require("../../models/User");
+const TeamModel = require("../../models/Team");
 const { errorMessages } = require("../../../utils/messages");
 const { GenerateAvatarImage } = require("../../../utils/imageProcessing");
 
diff --git a/Server/middleware/verifyJWT.js b/Server/middleware/verifyJWT.js
index 0007bad39..8e2e88b6f 100644
--- a/Server/middleware/verifyJWT.js
+++ b/Server/middleware/verifyJWT.js
@@ -4,7 +4,7 @@ const SERVICE_NAME = "verifyJWT";
 const TOKEN_PREFIX = "Bearer ";
 const { errorMessages } = require("../utils/messages");
 const { parse } = require("path");
-const User = require("../models/User");
+const User = require("../db/models/User");
 /**
  * Verifies the JWT token
  * @function
diff --git a/Server/routes/authRoute.js b/Server/routes/authRoute.js
index 362f6a5a2..82628f347 100644
--- a/Server/routes/authRoute.js
+++ b/Server/routes/authRoute.js
@@ -4,7 +4,7 @@ const { verifyOwnership } = require("../middleware/verifyOwnership");
 const { isAllowed } = require("../middleware/isAllowed");
 const multer = require("multer");
 const upload = multer();
-const User = require("../models/User");
+const User = require("../db/models/User");
 
 const {
   registerController,
diff --git a/Server/routes/checkRoute.js b/Server/routes/checkRoute.js
index fe99e7271..47b48809d 100644
--- a/Server/routes/checkRoute.js
+++ b/Server/routes/checkRoute.js
@@ -2,7 +2,7 @@ const router = require("express").Router();
 const checkController = require("../controllers/checkController");
 const { verifyOwnership } = require("../middleware/verifyOwnership");
 const { isAllowed } = require("../middleware/isAllowed");
-const Monitor = require("../models/Monitor");
+const Monitor = require("../db/models/Monitor");
 
 router.get("/:monitorId", checkController.getChecks);
 router.post(
diff --git a/Server/routes/maintenanceWindowRoute.js b/Server/routes/maintenanceWindowRoute.js
index c357df76b..8ed15b609 100644
--- a/Server/routes/maintenanceWindowRoute.js
+++ b/Server/routes/maintenanceWindowRoute.js
@@ -1,7 +1,7 @@
 const router = require("express").Router();
 const maintenanceWindowController = require("../controllers/maintenanceWindowController");
 const { verifyOwnership } = require("../middleware/verifyOwnership");
-const Monitor = require("../models/Monitor");
+const Monitor = require("../db/models/Monitor");
 
 router.get(
   "/monitor/:monitorId",
diff --git a/Server/routes/settingsRoute.js b/Server/routes/settingsRoute.js
index 3cbfff2b8..521987aec 100644
--- a/Server/routes/settingsRoute.js
+++ b/Server/routes/settingsRoute.js
@@ -1,7 +1,7 @@
 const router = require("express").Router();
 const settingsController = require("../controllers/settingsController");
 const { isAllowed } = require("../middleware/isAllowed");
-const Monitor = require("../models/Monitor");
+const Monitor = require("../db/models/Monitor");
 
 router.get("/", settingsController.getAppSettings);
 router.put(
diff --git a/Server/service/pageSpeedService.js b/Server/service/pageSpeedService.js
index b482e7860..189ed46f5 100644
--- a/Server/service/pageSpeedService.js
+++ b/Server/service/pageSpeedService.js
@@ -1,4 +1,4 @@
-const PageSpeedCheck = require("../models/PageSpeedCheck");
+const PageSpeedCheck = require("../db/models/PageSpeedCheck");
 const axios = require("axios");
 const logger = require("../utils/logger");
 
diff --git a/Server/service/settingsService.js b/Server/service/settingsService.js
index 752f86607..1a4200a5a 100644
--- a/Server/service/settingsService.js
+++ b/Server/service/settingsService.js
@@ -1,5 +1,5 @@
 const { env } = require("process");
-const AppSettings = require("../models/AppSettings");
+const AppSettings = require("../db/models/AppSettings");
 const SERVICE_NAME = "SettingsService";
 const envConfig = {
   logLevel: undefined,