diff --git a/.gitignore b/.gitignore
index ee0d1ba..79cfe3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules/
 info.log
-storage/
\ No newline at end of file
+storage/
+uploads/
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index f1770a9..ba1dbda 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "cors": "^2.8.5",
         "express": "^4.21.0",
+        "multer": "^1.4.5-lts.1",
         "mysql2": "^3.11.3",
         "pg": "^8.13.0",
         "swagger-jsdoc": "^6.2.8",
@@ -124,6 +125,12 @@
         "node": ">= 8"
       }
     },
+    "node_modules/append-field": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz",
+      "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==",
+      "license": "MIT"
+    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -211,6 +218,23 @@
         "node": ">=8"
       }
     },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "license": "MIT"
+    },
+    "node_modules/busboy": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
+      "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==",
+      "dependencies": {
+        "streamsearch": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=10.16.0"
+      }
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -285,6 +309,21 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "license": "MIT"
     },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "engines": [
+        "node >= 0.8"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -321,6 +360,12 @@
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
       "license": "MIT"
     },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "license": "MIT"
+    },
     "node_modules/cors": {
       "version": "2.8.5",
       "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
@@ -826,6 +871,12 @@
       "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==",
       "license": "MIT"
     },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "license": "MIT"
+    },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -958,12 +1009,51 @@
         "node": "*"
       }
     },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
+    "node_modules/multer": {
+      "version": "1.4.5-lts.1",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz",
+      "integrity": "sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==",
+      "license": "MIT",
+      "dependencies": {
+        "append-field": "^1.0.0",
+        "busboy": "^1.0.0",
+        "concat-stream": "^1.5.2",
+        "mkdirp": "^0.5.4",
+        "object-assign": "^4.1.1",
+        "type-is": "^1.6.4",
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
     "node_modules/mysql2": {
       "version": "3.11.3",
       "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.11.3.tgz",
@@ -1295,6 +1385,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "license": "MIT"
+    },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -1354,6 +1450,27 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -1546,6 +1663,29 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/streamsearch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
+      "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -1657,6 +1797,12 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+      "license": "MIT"
+    },
     "node_modules/undefsafe": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
@@ -1680,6 +1826,12 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
+    },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
diff --git a/package.json b/package.json
index a87690b..35de5c9 100755
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
   "dependencies": {
     "cors": "^2.8.5",
     "express": "^4.21.0",
+    "multer": "^1.4.5-lts.1",
     "mysql2": "^3.11.3",
     "pg": "^8.13.0",
     "swagger-jsdoc": "^6.2.8",
diff --git a/routes/api.js b/routes/api.js
index cbbb357..318dfc9 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -6,9 +6,12 @@ const fs = require('fs');
 const ffmpeg = require('../ffmpeg');
 const fileUtils = require('../utils/fileUtils');
 const serverError = require('../utils/serverError');
+const multer = require('multer');
 const video = require('../utils/video');
-const dbTester = require('../test/dbTester');
+const dbTester = require('../test/tester');
 const cors = require('cors'); // Import the cors package
+const projectManager = require('../src/project/projectManager.js');
+const measureManager = require('../src/measure/measureManager.js');
 
 router.use(cors({
   origin: ['http://127.0.0.1:5500', 'http://localhost:5500', 'http://localhost:3000'],
@@ -30,44 +33,10 @@ router.use(cors({
  */
 router.get('/projects', async (req, res) => {
   try {
-    const projects = await db.query('SELECT * FROM public.projects');
-    res.json(projects.rows);
+    const projects = await projectManager.getAllProjects();
+    res.json(projects);
   } catch (error) {
-    serverError.sendError('Error getting projects:', res, error);
-  }
-});
-
-/**
- * @swagger
- * /projects/{id}/create-video:
- *   get:
- *     description: Create a video from images of a specific project by project id
- *     parameters:
- *       - in: path
- *         name: id
- *         required: true
- *         description: Numeric ID of the project to create video for.
- *         schema:
- *           type: integer
- *     responses:
- *       200:
- *         description: Video created successfully
- *       404:
- *         description: No images found for this project
- *       500:
- *         description: Internal server error
- */
-router.get('/projects/:id/create-video', async (req, res) => {
-  const projectId = req.params.id;
-  if (!projectId || isNaN(projectId)) {
-    return res.status(400).json({ error: 'Invalid project ID' });
-  }
-  try {
-    const videoPath = await video.createVideo(projectId);
-    res.json(videoPath);
-    res.status(200).json({ message: 'Video created successfully', videoPath });
-  } catch (error) {
-    serverError.sendError('Error creating video:', res, error);
+    serverError.sendError('Error getting all projects:', res, error);
   }
 });
 
@@ -95,13 +64,10 @@ router.get('/projects/:id', async (req, res) => {
     return res.status(400).json({ error: 'Invalid project ID' });
   }
   try {
-    const project = await db.query('SELECT * FROM public.projects WHERE id = $1', [projectId]);
-    if (project.rows.length === 0) {
-      return res.status(404).json({ error: 'Project not found' });
-    }
-    res.json(project.rows[0]);
+    const project = await projectManager.getProjectById(projectId);
+    res.json(project);
   } catch (error) {
-    serverError.sendError('Error getting project:', res, error);
+    serverError.sendError('Error getting project by ID:', res, error);
   }
 });
 
@@ -123,18 +89,18 @@ router.get('/projects/:id', async (req, res) => {
  *       500:
  *         description: Internal server error
  */
-router.get('/projects/:id/videos', (req, res) => {
+router.get('/projects/:id/videos', async (req, res) => {
   const projectId = req.params.id;
   if (!projectId || isNaN(projectId)) {
     return res.status(400).json({ error: 'Invalid project ID' });
   }
-  const query = 'SELECT * FROM public.videos WHERE project_id = $1';
-  db.query(query, [projectId], (err, results) => {
-    if (err) {
-      serverError.sendError('Erreur lors de la récupération des vidéos pour le projet:', res, err);
-    }
-    res.json(results.rows);
-  });
+  try {
+    const videos = await projectManager.getVideosByProjectId(projectId);
+    res.json(videos);
+  }
+  catch (error) {
+    serverError.sendError('Error getting videos by project ID:', res, error);
+  }
 });
 
 /**
@@ -155,18 +121,18 @@ router.get('/projects/:id/videos', (req, res) => {
  *       500:
  *         description: Internal server error
  */
-router.get('/projects/:id/measurements', (req, res) => {
+router.get('/projects/:id/measurements', async (req, res) => {
   const projectId = req.params.id;
   if (!projectId || isNaN(projectId)) {
     return res.status(400).json({ error: 'Invalid project ID' });
   }
-  const query = 'SELECT * FROM public.measurements WHERE project_id = $1';
-  db.query(query, [projectId], (err, results) => {
-    if (err) {
-      serverError.sendError('Erreur lors de la récupération des mesures pour le projet:', res, err);
-    }
-    res.json(results.rows);
-  });
+  try {
+    const measurements = await projectManager.getMeasurementsByProjectId(projectId);
+    res.json(measurements);
+  }
+  catch (error) {
+    serverError.sendError('Error getting measurements by project ID:', res, error);
+  }
 });
 
 /**
@@ -196,15 +162,12 @@ router.post('/projects', async (req, res) => {
   if (!name || !description) {
     return res.status(400).json({ error: 'Name and description are required' });
   }
-
   try {
-    const query = `INSERT INTO public.projects (name, description, status) VALUES ($1, $2, 0) RETURNING id`;
-    const result = await db.query(query, [name, description]);
-    const projectId = result.rows[0].id;
-
-    fileUtils.createProjectDirectory(projectId);
-    res.status(201).json({ message: 'Project created successfully', projectId });
-  } catch (error) {
+    project = await projectManager.createProject(name, description, new Date(), 0);
+    projectManager.createProjectDirectory(project.id);
+    res.status(201).json({ message: 'Project added successfully', id: project.id });
+  }
+  catch (error) {
     serverError.sendError('Error creating project:', res, error);
   }
 });
@@ -236,12 +199,8 @@ router.delete('/projects/:id', async (req, res) => {
   }
 
   try {
-    const result = await db.query('DELETE FROM public.projects WHERE id = $1 RETURNING id', [projectId]);
-    if (result.rowCount === 0) {
-      return res.status(404).json({ error: 'No project found with this ID' });
-    }
-
-    fileUtils.deleteProjectDirectory(projectId);
+    projectManager.deleteProjectDirectory(projectId);
+    projectManager.deleteProjectById(projectId);
     res.status(200).json({ message: 'Project deleted successfully', id: projectId });
   } catch (error) {
     serverError.sendError('Error deleting project:', res, error);
@@ -533,7 +492,7 @@ router.delete('/videos/:id', (req, res) => {
  *         description: Image not found
  */
 router.get('/smile', (req, res) => {
-  const imagePath = path.join('/storage/smile.jpg');
+  const imagePath = dbTester.getSmileImage();
   fs.access(imagePath, fs.constants.F_OK, (err) => {
     if (err) {
       console.error('Image not found:', err);
@@ -573,4 +532,50 @@ router.get('/image/:filename', (req, res) => {
   });
 });
 
-module.exports = router;
+const upload = multer({ storage: multer.memoryStorage() });
+
+/**
+ * @swagger
+ * /upload:
+ *   post:
+ *     description: Use to upload an image
+ *     requestBody:
+ *       required: true
+ *       content:
+ *         multipart/form-data:
+ *           schema:
+ *             type: object
+ *             properties:
+ *               image:
+ *                 type: string
+ *                 format: binary
+ *               projectId:
+ *                 type: integer
+ *               orderId:
+ *                 type: integer
+ *     responses:
+ *       200:
+ *         description: Image uploaded successfully
+ *       400:
+ *         description: All fields are required
+ *       500:
+ *         description: Internal server error
+ */
+
+router.post('/upload', upload.single('image'), async (req, res) => {
+  const { projectId, orderId } = req.body;
+  const image = req.file; // Multer adds the file to req.file
+
+  if (!image || !projectId || !orderId) {
+    return res.status(400).json({ error: 'All fields are required' });
+  }
+
+  try {
+    const imagePath = await measureManager.uploadMeasureImage(image, projectId, orderId);
+    res.json({ message: 'Image uploaded successfully', path: imagePath });
+  } catch (error) {
+    serverError.sendError('Error uploading image:', res, error);
+  }
+});
+
+module.exports = router;
\ No newline at end of file
diff --git a/sample/smile.png b/sample/smile.png
new file mode 100644
index 0000000..c5c51cd
Binary files /dev/null and b/sample/smile.png differ
diff --git a/src/data/storageManager.js b/src/data/storageManager.js
new file mode 100644
index 0000000..7b39755
--- /dev/null
+++ b/src/data/storageManager.js
@@ -0,0 +1,43 @@
+const fs = require('fs');
+const path = require('path');
+const PROJECTS_DIR = path.join('.');
+
+function createFolder(name){
+   const projectDir = path.join(PROJECTS_DIR, `${name}`);
+   if (!fs.existsSync(projectDir)) {
+      fs.mkdirSync(projectDir, { recursive: true });
+   }
+   return projectDir;
+}
+
+function deleteFolder(name){
+   const projectDir = path.join(PROJECTS_DIR, `${name
+   }`);
+   if (fs.existsSync
+   (projectDir)) {
+      fs.rmSync(projectDir, { recursive: true, force: true });
+   }
+}
+
+function saveFile(filePath, content) {
+   // Ensure content is a buffer
+   if (Buffer.isBuffer(content)) {
+      fs.writeFileSync(filePath, content);
+   } else {
+      throw new Error('Content must be a buffer');
+   }
+}
+
+
+function getFile(name){
+   const filePath = path.join(PROJECTS_DIR, `${name}`);
+   return fs
+   .readFileSync(filePath);
+}
+
+module.exports = {
+   createFolder,
+   deleteFolder,
+   saveFile,
+   getFile
+};
\ No newline at end of file
diff --git a/src/measure/measureManager.js b/src/measure/measureManager.js
new file mode 100644
index 0000000..024cbc5
--- /dev/null
+++ b/src/measure/measureManager.js
@@ -0,0 +1,38 @@
+import db from '../../db.js';
+import path from 'path';
+import storageManager from '../data/storageManager.js';
+
+async function uploadMeasureImage(image, projectId, orderId) {
+   // Create the project directory if it doesn't exist
+   const projectDir = storageManager.createFolder(projectId.toString());
+
+   // Create the images directory within the project directory
+   const imagesDir = storageManager.createFolder(path.join(projectDir, 'images'));
+
+   // Define the path where the image will be saved
+   const imagePath = path.join(imagesDir, `${orderId}.jpg`);
+
+   // Save the uploaded image to the defined path
+   storageManager.saveFile(imagePath, image.buffer);
+
+   return imagePath;
+}
+
+
+async function getMeasureImage(projectId, orderId) {
+   const projectPath = `${projectId}`;
+   const imagePath = `${projectPath}/${orderId}.jpg`;
+   return storageManager.getFile(imagePath);
+}
+
+async function addMeasureToProject(projectId, timestamp, imagePath, temperature, humidity, completed) {
+   const query = 'INSERT INTO public.measurements (project_id, timestamp, image_path, temperature, humidity, completed) VALUES ($1, $2, $3, $4, $5, $6) RETURNING *';
+   const values = [projectId, timestamp, imagePath, temperature, humidity, completed];
+   const res = await db.query(query, values);
+   return res.rows[0];
+}
+
+export {
+   uploadMeasureImage,
+   addMeasureToProject
+}
\ No newline at end of file
diff --git a/src/project/projectManager.js b/src/project/projectManager.js
new file mode 100644
index 0000000..ed5e0ca
--- /dev/null
+++ b/src/project/projectManager.js
@@ -0,0 +1,74 @@
+import storageManager from '../data/storageManager.js';
+import db from '../../db.js';
+
+function createProjectDirectory(projectId) {
+   const projectPath = `${projectId}`;
+   storageManager.createFolder(projectPath);
+   storageManager.createFolder(`${projectPath}/images`);
+   storageManager.createFolder(`${projectPath}/videos`);
+}
+
+function deleteProjectDirectory(projectId) {
+   const projectPath = `${projectId}`;
+   storageManager.deleteFolder(projectPath);
+}
+
+async function getAllProjects() {
+   const query = 'SELECT * FROM public.projects';
+   const res = await db.query(query);
+   console.log('getAllProjects:', res.rows);
+   return res.rows;
+}
+
+async function getProjectById(projectId) {
+   const query = 'SELECT * FROM public.projects WHERE id = $1';
+   const values = [projectId];
+   const res = await db.query(query, values);
+   return res.rows[0];
+}
+
+async function createProject(name, description, start_date, status) {
+   const query = 'INSERT INTO public.projects (name, description, start_date, status) VALUES ($1, $2, $3, $4) RETURNING *';
+   const values = [name, description, start_date, status];
+   const res = await db.query(query, values);
+   return res.rows[0];
+}
+
+async function editProjectById(projectID, name, description, startDate, status) {
+   const query = 'UPDATE public.projects SET name = $1, description = $2, start_date = $3, status = $4 WHERE id = $5 RETURNING *';
+   const values = [name, description, startDate, status, projectID];
+   const res = await db.query(query, values);
+   return res.rows[0];
+}
+
+async function deleteProjectById(projectId) {
+   const query = 'DELETE FROM public.projects WHERE id = $1';
+   const values = [projectId];
+   await db.query(query, values);
+}
+
+async function getVideosByProjectId(projectId) {
+   const query = 'SELECT * FROM public.videos WHERE project_id = $1';
+   const values = [projectId];
+   const res = await db.query(query, values);
+   return res.rows;
+}
+
+async function getMeasurementsByProjectId(projectId) {
+   const query = 'SELECT * FROM public.measurements WHERE project_id = $1';
+   const values = [projectId];
+   const res = await db.query(query, values);
+   return res.rows;
+}
+
+export {
+   createProjectDirectory,
+   deleteProjectDirectory,
+   getAllProjects,
+   getProjectById,
+   createProject,
+   editProjectById,
+   deleteProjectById,
+   getVideosByProjectId,
+   getMeasurementsByProjectId
+};
diff --git a/test/dbTester.js b/test/dbTester.js
deleted file mode 100644
index 72be37b..0000000
--- a/test/dbTester.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const databaseUtils = require('../utils/dbUtils');
-const storageManager = require('../src/storage/storageManager');
-
-console.log('Testing database functions...');
-
-try {
-   storageManager.createFolder('test');
-   storageManager.deleteFolder('test');
-} catch (error) {
-   console.error('Error testing database functions:', error);
-}
\ No newline at end of file