diff --git a/mobile/docs/TODO.md b/mobile/docs/TODO.md
index 401e21b..03328eb 100644
--- a/mobile/docs/TODO.md
+++ b/mobile/docs/TODO.md
@@ -20,4 +20,3 @@
 - [ ] Ajouter imprécision de la position au besoin (comme sur google maps)
 - [ ] Synchroniser les horloges sur l'interface
 - [ ] Améliorer l'intuitivité de l'interface (bouton d'actualisation / stats)
-- [ ] Publier sur le playstore
diff --git a/server/docs/TODO.md b/server/docs/TODO.md
index c4b1047..0a9cfdf 100644
--- a/server/docs/TODO.md
+++ b/server/docs/TODO.md
@@ -23,7 +23,32 @@
 - [ ] Pouvoir load des paramètres enregistrés
 - [ ] Penser l'affichage en fin de traque
 
+## Ancien TODO
+
+- [ ] Rendre plus évident qui chasse qui quand on clique sur une équipe
+- [ ] Montrer les dernières pos envoyées et la position de l'ennemie selon chaque équipe
+- [ ] Logs des events de la game
+- [ ] Save les configs de la partie (surtout en cas de crash)
+- [ ] Afficher listes des kills
+- [ ] Déplacer les équipes éliminées dans un classement provisoire
+
 ## Autres idées
 
 - Améliorer l'accessibilité (traduction anglaise notamment).
 - Améliorer l'UI.
+
+## Idées générales pour le jeu la traque
+
+Avoir des sorte de powerup sous la forme d'objets physiques avec un code dessus dans la zone de jeu, en entrant le code dans l'app on pourrait débloquer un pouvoir en mode :
+
+reveller le nom de l'équipe en train de nous traquer
+Reveller la position de l'équipe en train de nous traquer
+Update la position de l'équipe traquée sans update sa position
+Reset le compteur avant pénalité
+Enlever une pénalité
+Transformer l'objet qui vient d'être récupéré en piège : la prochaine équipe qui l'active prend une pénalité, l'objet peut être placé n'importe ou (ne peut être activé qu'une fois)
+Un nerf
+3 ticket t+
+Gilet lesté
+Gilet jaune
+Une cloche sur un colier
diff --git a/server/traque-back/.dockerignore b/server/traque-back/.dockerignore
index f4c434e..7b8c6e7 100644
--- a/server/traque-back/.dockerignore
+++ b/server/traque-back/.dockerignore
@@ -5,4 +5,4 @@ npm-debug.log
 README.md
 .next
 .git
-.vscode
\ No newline at end of file
+.vscode
diff --git a/server/traque-back/Makefile b/server/traque-back/Makefile
deleted file mode 100644
index 75f93ad..0000000
--- a/server/traque-back/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#Make a self signed certificate for development
-keys: key.pem server.crt
-
-key.pem csr.pem:
-	openssl req -newkey rsa:2048 -new -nodes -keyout key.pem -out csr.pem
-
-server.crt: key.pem csr.pem
-	openssl x509 -req -days 365 -in csr.pem -signkey key.pem -out server.crt
\ No newline at end of file
diff --git a/server/traque-back/images/missing_image.jpg b/server/traque-back/assets/images/missing_image.jpg
similarity index 100%
rename from server/traque-back/images/missing_image.jpg
rename to server/traque-back/assets/images/missing_image.jpg
diff --git a/server/traque-back/package.json b/server/traque-back/package.json
index 34131e1..f82221c 100644
--- a/server/traque-back/package.json
+++ b/server/traque-back/package.json
@@ -2,11 +2,11 @@
   "name": "traque-back",
   "version": "1.0.0",
   "description": "",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node index.js",
-    "dev": "nodemon index.js"
+    "start": "node src/index.js",
+    "dev": "nodemon src/index.js"
   },
   "author": "Quentin Roussel",
   "license": "ISC",
diff --git a/server/traque-back/admin_socket.js b/server/traque-back/src/admin_socket.js
similarity index 100%
rename from server/traque-back/admin_socket.js
rename to server/traque-back/src/admin_socket.js
diff --git a/server/traque-back/game.js b/server/traque-back/src/game.js
similarity index 100%
rename from server/traque-back/game.js
rename to server/traque-back/src/game.js
diff --git a/server/traque-back/index.js b/server/traque-back/src/index.js
similarity index 100%
rename from server/traque-back/index.js
rename to server/traque-back/src/index.js
diff --git a/server/traque-back/photo.js b/server/traque-back/src/photo.js
similarity index 88%
rename from server/traque-back/photo.js
rename to server/traque-back/src/photo.js
index e53f723..cc4e37a 100644
--- a/server/traque-back/photo.js
+++ b/server/traque-back/src/photo.js
@@ -6,7 +6,8 @@ import multer from "multer";
 import fs from "fs";
 import path from "path";
 import game from "./game.js";
-const UPLOAD_DIR = "uploads/"
+const UPLOAD_DIR = path.join(process.cwd(), "uploads");
+const IMAGES_DIR = path.join(process.cwd(), "assets", "images");
 const ALLOWED_MIME = [
     "image/png",
     "image/jpeg",
@@ -60,10 +61,10 @@ export function initPhotoUpload() {
     app.get("/photo/my", (req, res) => {
         let team = game.getTeam(req.query.team);
         if (team) {
-            const imagePath = path.join(process.cwd(), UPLOAD_DIR, team.id);
+            const imagePath = path.join(UPLOAD_DIR, team.id);
             res.set("Content-Type", "image/png")
             res.set("Access-Control-Allow-Origin", "*");
-            res.sendFile(fs.existsSync(imagePath) ? imagePath : path.join(process.cwd(), "images", "missing_image.jpg"));
+            res.sendFile(fs.existsSync(imagePath) ? imagePath : path.join(IMAGES_DIR, "missing_image.jpg"));
         } else {
             res.status(400).send("Team not found")
         }
@@ -72,10 +73,10 @@ export function initPhotoUpload() {
     app.get("/photo/enemy", (req, res) => {
         let team = game.getTeam(req.query.team);
         if (team) {
-            const imagePath = path.join(process.cwd(), UPLOAD_DIR, team.chasing);
+            const imagePath = path.join(UPLOAD_DIR, team.chasing);
             res.set("Content-Type", "image/png")
             res.set("Access-Control-Allow-Origin", "*");
-            res.sendFile(fs.existsSync(imagePath) ? imagePath : path.join(process.cwd(), "images", "missing_image.jpg"));
+            res.sendFile(fs.existsSync(imagePath) ? imagePath : path.join(IMAGES_DIR, "missing_image.jpg"));
         } else {
             res.status(400).send("Team not found")
         }
diff --git a/server/traque-back/team_socket.js b/server/traque-back/src/team_socket.js
similarity index 100%
rename from server/traque-back/team_socket.js
rename to server/traque-back/src/team_socket.js
diff --git a/server/traque-back/timeout_handler.js b/server/traque-back/src/timeout_handler.js
similarity index 100%
rename from server/traque-back/timeout_handler.js
rename to server/traque-back/src/timeout_handler.js
diff --git a/server/traque-back/trajectory.js b/server/traque-back/src/trajectory.js
similarity index 89%
rename from server/traque-back/trajectory.js
rename to server/traque-back/src/trajectory.js
index 1b4b0a7..1f6db66 100644
--- a/server/traque-back/trajectory.js
+++ b/server/traque-back/src/trajectory.js
@@ -1,12 +1,12 @@
 import fs from "fs";
 import path from "path";
-const UPLOAD_DIR = "trajectories";
+const TRAJECTORIES_DIR = path.join(process.cwd(), "trajectories");
 const EXTENSION = "txt";
 
 // Useful functions
 
 function teamIDToPath(teamID) {
-    return path.join(UPLOAD_DIR, teamID + "." + EXTENSION);
+    return path.join(TRAJECTORIES_DIR, teamID + "." + EXTENSION);
 }
 
 function dataToLine(...data) {
@@ -44,8 +44,8 @@ function addLineToFile(teamID, line) {
 }
 
 function initTrajectories() {
-    const files = fs.readdirSync(UPLOAD_DIR);
-    for (const file of files) fs.unlinkSync(path.join(UPLOAD_DIR, file));
+    const files = fs.readdirSync(TRAJECTORIES_DIR);
+    for (const file of files) fs.unlinkSync(path.join(TRAJECTORIES_DIR, file));
 }
 
 // Export functions
diff --git a/server/traque-back/zone_manager.js b/server/traque-back/src/zone_manager.js
similarity index 100%
rename from server/traque-back/zone_manager.js
rename to server/traque-back/src/zone_manager.js