diff --git a/node-api/.env.example b/node-api/.env.example
deleted file mode 100644
index 1189668f..00000000
--- a/node-api/.env.example
+++ /dev/null
@@ -1,9 +0,0 @@
-DB_LINK="mongo-link-to-connect"
-
-JWT_SECRET="token"
-
-APP_URL_CLIENT=https://material-dashboard-react-node.creative-tim.com
-APP_URL_API=https://node-json-api-free.creative-tim.com/login
-
-MAILTRAP_USER=
-MAILTRAP_PASSWORD=
\ No newline at end of file
diff --git a/node-api/src/index.js b/node-api/src/index.js
index 04d9326e..baebf78f 100644
--- a/node-api/src/index.js
+++ b/node-api/src/index.js
@@ -3,12 +3,12 @@ import bodyParser from "body-parser";
 import cors from "cors";
 import dotenv from "dotenv";
 import "./passport.js";
-import { dbConnect } from "./mongo";
-import { meRoutes, authRoutes } from "./routes";
+import { dbConnect } from "./mongo/index.js";
+import { meRoutes, authRoutes } from "./routes/index.js";
 import path from "path";
 import * as fs from "fs";
 import cron from "node-cron";
-import ReseedAction from "./mongo/ReseedAction";
+import ReseedAction from "./mongo/ReseedAction.js";
 
 dotenv.config();
 
diff --git a/node-api/src/mongo/index.js b/node-api/src/mongo/index.js
index 32f3a3c5..4b39650b 100644
--- a/node-api/src/mongo/index.js
+++ b/node-api/src/mongo/index.js
@@ -1,12 +1,39 @@
 import mongoose from "mongoose";
 import dotenv from "dotenv";
+import { MongoClient, ServerApiVersion } from 'mongodb';
 
 dotenv.config();
 
-export const dbConnect = () => {
+export const dbConnect = async () => {
+// console.log(process.env.MONGO_PASS)
+// const uri = `mongodb+srv://asiyabatool987:${encodeURIComponent(process.env.MONGO_PASS)}@cluster0.3y2vgwn.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0`;
+
+// // Create a MongoClient with a MongoClientOptions object to set the Stable API version
+// const client = new MongoClient(uri, {
+//   serverApi: {
+//     version: ServerApiVersion.v1,
+//     strict: true,
+//     deprecationErrors: true,
+//   }
+// });
+
+// async function run() {
+//   try {
+//     // Connect the client to the server	(optional starting in v4.7)
+//     await client.connect();
+//     // Send a ping to confirm a successful connection
+//     await client.db("admin").command({ ping: 1 });
+//     console.log("Pinged your deployment. You successfully connected to MongoDB!");
+//   } finally {
+//     // Ensures that the client will close when you finish/error
+//     await client.close();
+//   }
+// }
+// run().catch(console.dir);
+
   mongoose.connection.once("open", () => console.log("DB connection"));
   return mongoose.connect(
-    `mongodb+srv://${process.env.DB_LINK}?retryWrites=true&w=majority`,
+    `mongodb+srv://asiyabatool987:${encodeURIComponent(process.env.MONGO_PASS)}@cluster0.3y2vgwn.mongodb.net`,
     { keepAlive: true }
   );
 };
diff --git a/node-api/src/passport.js b/node-api/src/passport.js
index 7ca7aa36..3b4a92f9 100644
--- a/node-api/src/passport.js
+++ b/node-api/src/passport.js
@@ -3,7 +3,7 @@ import passportJWT from "passport-jwt";
 import dotenv from "dotenv";
 import passport from "passport";
 
-import { userModel } from "./schemas/user.schema";
+import { userModel } from "./schemas/user.schema.js";
 const JWTStrategy = passportJWT.Strategy;
 dotenv.config();
 
diff --git a/node-api/src/routes/auth/index.js b/node-api/src/routes/auth/index.js
index 309d449a..589c7c7f 100644
--- a/node-api/src/routes/auth/index.js
+++ b/node-api/src/routes/auth/index.js
@@ -4,7 +4,7 @@ import {
   loginRouteHandler,
   registerRouteHandler,
   resetPasswordRouteHandler,
-} from "../../services/auth";
+} from "../../services/auth/index.js";
 
 const router = express.Router();
 
diff --git a/node-api/src/routes/index.js b/node-api/src/routes/index.js
index 663cb637..c882be4b 100644
--- a/node-api/src/routes/index.js
+++ b/node-api/src/routes/index.js
@@ -1,5 +1,5 @@
-import userRoutes from './users';
-import meRoutes from './me';
-import authRoutes from './auth';
+import userRoutes from './users/index.js';
+import meRoutes from './me/index.js';
+import authRoutes from './auth/index.js';
 
 export { userRoutes, meRoutes, authRoutes };
diff --git a/node-api/src/routes/me/index.js b/node-api/src/routes/me/index.js
index 99a31dde..fdca766d 100644
--- a/node-api/src/routes/me/index.js
+++ b/node-api/src/routes/me/index.js
@@ -3,7 +3,7 @@ import passport from "passport";
 import jwt from 'jsonwebtoken';
 
 const router = express.Router();
-import { getProfileRouteHandler, patchProfileRouteHandler } from "../../services/me";
+import { getProfileRouteHandler, patchProfileRouteHandler } from "../../services/me/index.js";
 
 // get user's profile
 router.get("/", passport.authenticate('jwt',{session: false}), (req, res) => {
diff --git a/node-api/src/services/auth/index.js b/node-api/src/services/auth/index.js
index 84965d61..e1c7315e 100644
--- a/node-api/src/services/auth/index.js
+++ b/node-api/src/services/auth/index.js
@@ -2,8 +2,8 @@ import dotenv from "dotenv";
 import nodemailer from "nodemailer";
 import randomToken from "random-token";
 import bcrypt from "bcrypt";
-import { userModel } from "../../schemas/user.schema";
-import { passwordResetModel } from "../../schemas/passwordResets.schema";
+import { userModel } from "../../schemas/user.schema.js";
+import { passwordResetModel } from "../../schemas/passwordResets.schema.js";
 import jwt from 'jsonwebtoken';
 
 dotenv.config();
diff --git a/node-api/src/services/me/index.js b/node-api/src/services/me/index.js
index b643600d..646641c2 100644
--- a/node-api/src/services/me/index.js
+++ b/node-api/src/services/me/index.js
@@ -1,6 +1,6 @@
 import bcrypt from "bcrypt";
 import dotenv from 'dotenv';
-import { userModel } from "../../schemas/user.schema";
+import { userModel } from "../../schemas/user.schema.js";
 import jwt from 'jsonwebtoken';
 
 dotenv.config();