diff --git a/server/routers/dogsitters-finder/index.js b/server/routers/dogsitters-finder/index.js
index a618a12..c0cfd87 100644
--- a/server/routers/dogsitters-finder/index.js
+++ b/server/routers/dogsitters-finder/index.js
@@ -1,52 +1,38 @@
-// const router = require("express").Router();
+const router = require("express").Router();
 
-// router.get("/users", (request, response) => {
-//   response.send(require("./json/users/users.json"));
-// });
+router.get("/users", (request, response) => {
+  response.send(require("./json/users/users.json"));
+});
 
-// router.post("/auth", (request, response) => {
-//   const { phoneNumber, password } = request.body;
-//   console.log(phoneNumber, password);
-//   if (phoneNumber === "89999999999") {
-//     response.send(require("./json/auth/dogsitter.success.json"));
-//   } else if (phoneNumber === "89555555555") {
-//     response.status(400).send(require("./json/auth/error.json"));
-//   } else {
-//     response.send(require("./json/auth/owner.success.json"));
-//   }
-// });
+router.post("/auth", (request, response) => {
+  const { phoneNumber, password } = request.body;
+  console.log(phoneNumber, password);
+  if (phoneNumber === "89999999999") {
+    response.send(require("./json/auth/dogsitter.success.json"));
+  } else if (phoneNumber === "89555555555") {
+    response.status(400).send(require("./json/auth/error.json"));
+  } else {
+    response.send(require("./json/auth/owner.success.json"));
+  }
+});
 
-// router.post("/auth/2fa", (request, response) => {
-//   const { code } = request.body;
-//   if (code === "0000") {
-//     response.send(require("./json/2fa/success.json"));
-//   } else {
-//     response.status(400).send(require("./json/2fa/error.json"));
-//   }
-// });
+router.post("/auth/2fa", (request, response) => {
+  const { code } = request.body;
+  if (code === "0000") {
+    response.send(require("./json/2fa/success.json"));
+  } else {
+    response.status(400).send(require("./json/2fa/error.json"));
+  }
+});
 
-// router.post("/register", (request, response) => {
-//   const { firstName, secondName, phoneNumber, password, role } = request.body;
-//   console.log(phoneNumber, password, role);
-//   if (phoneNumber === "89283244141" || phoneNumber === "89872855893") {
-//     response.status(400).send(require("./json/register/error.json"));
-//   } else if (role === "dogsitter") {
-//     response.send(require("./json/register/dogsitter.success.json"));
-//   } else {
-//     response.send(require("./json/register/owner.success.json"));
-//   }
-// });
-
-// module.exports = router;
-
-const { Router } = require('express')
-
-const router = Router()
-
-const userInteractionRouter = require('./routes')
-const authRouter = require('./auth')
-
-router.use('/auth', authRouter)
-router.use('/user-interaction', userInteractionRouter)
-
-module.exports = router
+router.post("/register", (request, response) => {
+  const { firstName, secondName, phoneNumber, password, role } = request.body;
+  console.log(phoneNumber, password, role);
+  if (phoneNumber === "89283244141" || phoneNumber === "89872855893") {
+    response.status(400).send(require("./json/register/error.json"));
+  } else if (role === "dogsitter") {
+    response.send(require("./json/register/dogsitter.success.json"));
+  } else {
+    response.send(require("./json/register/owner.success.json"));
+  }
+});
\ No newline at end of file
diff --git a/server/routers/dogsitters-finder/legacy/json/2fa/error.json b/server/routers/dogsitters-finder/json/2fa/error.json
similarity index 100%
rename from server/routers/dogsitters-finder/legacy/json/2fa/error.json
rename to server/routers/dogsitters-finder/json/2fa/error.json
diff --git a/server/routers/dogsitters-finder/legacy/json/2fa/success.json b/server/routers/dogsitters-finder/json/2fa/success.json
similarity index 100%
rename from server/routers/dogsitters-finder/legacy/json/2fa/success.json
rename to server/routers/dogsitters-finder/json/2fa/success.json
diff --git a/server/routers/dogsitters-finder/legacy/json/auth/dogsitter.success.json b/server/routers/dogsitters-finder/json/auth/dogsitter.success.json
similarity index 100%
rename from server/routers/dogsitters-finder/legacy/json/auth/dogsitter.success.json
rename to server/routers/dogsitters-finder/json/auth/dogsitter.success.json
diff --git a/server/routers/dogsitters-finder/legacy/json/auth/error.json b/server/routers/dogsitters-finder/json/auth/error.json
similarity index 100%
rename from server/routers/dogsitters-finder/legacy/json/auth/error.json
rename to server/routers/dogsitters-finder/json/auth/error.json
diff --git a/server/routers/dogsitters-finder/legacy/json/auth/owner.success.json b/server/routers/dogsitters-finder/json/auth/owner.success.json
similarity index 100%
rename from server/routers/dogsitters-finder/legacy/json/auth/owner.success.json
rename to server/routers/dogsitters-finder/json/auth/owner.success.json
diff --git a/server/routers/dogsitters-finder/legacy/json/register/dogsitter.success.json b/server/routers/dogsitters-finder/json/register/dogsitter.success.json
similarity index 100%
rename from server/routers/dogsitters-finder/legacy/json/register/dogsitter.success.json
rename to server/routers/dogsitters-finder/json/register/dogsitter.success.json
diff --git a/server/routers/dogsitters-finder/legacy/json/register/error.json b/server/routers/dogsitters-finder/json/register/error.json
similarity index 100%
rename from server/routers/dogsitters-finder/legacy/json/register/error.json
rename to server/routers/dogsitters-finder/json/register/error.json
diff --git a/server/routers/dogsitters-finder/legacy/json/register/owner.success.json b/server/routers/dogsitters-finder/json/register/owner.success.json
similarity index 100%
rename from server/routers/dogsitters-finder/legacy/json/register/owner.success.json
rename to server/routers/dogsitters-finder/json/register/owner.success.json
diff --git a/server/routers/dogsitters-finder/legacy/json/users/users.json b/server/routers/dogsitters-finder/json/users/users.json
similarity index 100%
rename from server/routers/dogsitters-finder/legacy/json/users/users.json
rename to server/routers/dogsitters-finder/json/users/users.json