diff --git a/api/main.java b/api/main.java
deleted file mode 100644
index b089137..0000000
--- a/api/main.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package app;
-
-import io.javalin.*;
-
-public class Main {
-    public static void main(String[] args) {
-        Javalin app = Javalin.create().start(7000);
-
-        ConstellationController controller = new ConstellationController();
-        app.get("/api/constellations", controller::getAll);
-        app.get("/api/constellations/{id}", controller::getOne);
-        app.post("/api/constellations/", controller::create);
-        app.put("/api/constellations/{id}", controller::update);
-        app.delete("/api/constellations/{id}", controller::delete);
-    }
-}
\ No newline at end of file
diff --git a/api/constellation.java b/src/main/java/ch/heig/dai/Constellation.java
similarity index 89%
rename from api/constellation.java
rename to src/main/java/ch/heig/dai/Constellation.java
index 4028728..de4f7d6 100644
--- a/api/constellation.java
+++ b/src/main/java/ch/heig/dai/Constellation.java
@@ -1,4 +1,4 @@
-package app;
+package ch.heig.dai;
 
 public class Constellation {
 
@@ -13,6 +13,6 @@ public Constellation(String name, String latinName, String abr, String origin) {
         this.name = name;
         this.latinName = name;
         this.abr = abr;
-        this.origin = origin
+        this.origin = origin;
     }
 }
\ No newline at end of file
diff --git a/api/constellationController.java b/src/main/java/ch/heig/dai/ConstellationController.java
similarity index 92%
rename from api/constellationController.java
rename to src/main/java/ch/heig/dai/ConstellationController.java
index cbb50d2..9fcdcf2 100644
--- a/api/constellationController.java
+++ b/src/main/java/ch/heig/dai/ConstellationController.java
@@ -1,18 +1,18 @@
-package app;
+package ch.heig.dai;
 
 import io.javalin.http.Context;
 import java.util.concurrent.ConcurrentHashMap;
 
-class ConstellationController {
+public class ConstellationController {
 
     // "Database" of constellations
     // Since the server is multi-threaded, we need to use a thread-safe data structure
     private ConcurrentHashMap<Integer, Constellation> constellations = new ConcurrentHashMap<Integer, Constellation>();
     private int lastId = 0;
 
-    public UserController() {
+    public ConstellationController() {
         // Add some constellation to the "database"
-        String name, String latinName, String abr, String origin)
+
         constellations.put(++lastId, new Constellation("L'Aigle", "Aquila/Aquilae",  "Aql", "Ptolémée"));
         constellations.put(++lastId, new Constellation("Le Burin", "Caelum/Caeli",  "Cae", "Lacaille"));
         constellations.put(++lastId, new Constellation("Le Caméléon", "Chamaeleon/Chamaeleontis",  "Cha", "Bayer"));
diff --git a/src/main/java/ch/heig/dai/Main.java b/src/main/java/ch/heig/dai/Main.java
index 33893de..0405f44 100644
--- a/src/main/java/ch/heig/dai/Main.java
+++ b/src/main/java/ch/heig/dai/Main.java
@@ -1,17 +1,17 @@
 package ch.heig.dai;
 
+import ch.heig.dai.ConstellationController;
 import io.javalin.*;
 
 public class Main {
     public static void main(String[] args) {
+        Javalin app = Javalin.create().start(7000);
 
-        Javalin app = Javalin.create().start(8000);
-
-        UserController userController = new UserController();
-        app.get("/api/users", userController::getAll);
-        app.get("/api/users/{id}", userController::getOne);
-        app.post("/api/users/", userController::create);
-        app.put("/api/users/{id}", userController::update);
-        app.delete("/api/users/{id}", userController::delete);
+        ConstellationController controller = new ConstellationController();
+        app.get("/api/constellations", controller::getAll);
+        app.get("/api/constellations/{id}", controller::getOne);
+        app.post("/api/constellations/", controller::create);
+        app.put("/api/constellations/{id}", controller::update);
+        app.delete("/api/constellations/{id}", controller::delete);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/ch/heig/dai/User.java b/src/main/java/ch/heig/dai/User.java
deleted file mode 100644
index 5938c2a..0000000
--- a/src/main/java/ch/heig/dai/User.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ch.heig.dai;
-
-public class User {
-    public String firstName = "";
-    public String lastName = "";
-
-    public User() { }
-
-    public User(String firstName, String lastName) {
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
-}
diff --git a/src/main/java/ch/heig/dai/UserController.java b/src/main/java/ch/heig/dai/UserController.java
deleted file mode 100644
index c7c033e..0000000
--- a/src/main/java/ch/heig/dai/UserController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package ch.heig.dai;
-
-import io.javalin.http.Context;
-import java.util.concurrent.ConcurrentHashMap;
-
-class UserController {
-    
-    // "Database" of users
-    // Since the server is multi-threaded, we need to use a thread-safe data structure
-    // such as ConcurrentHashMap or HashMap
-    private ConcurrentHashMap<Integer, User> users = new ConcurrentHashMap<Integer, User>();
-    private int lastId = 0;
-
-    public UserController() {
-        // Add some users to the "database"
-        users.put(++lastId, new User("Anita", "Braig"));
-        users.put(++lastId, new User("Bill", "Ding"));
-        users.put(++lastId, new User("Chris P.", "Bacon"));
-    }
-
-    public void getOne(Context ctx) {
-        int id = Integer.parseInt(ctx.pathParam("id"));
-        ctx.json(users.get(id));
-    }
-
-    public void getAll(Context ctx) {
-        ctx.json(users);
-    }
-
-    public void create(Context ctx) {
-        User user = ctx.bodyAsClass(User.class);
-        users.put(++lastId, user);
-        ctx.status(201);
-    }
-
-    public void delete(Context ctx) {
-        int id = Integer.parseInt(ctx.pathParam("id"));
-        users.remove(id);
-        ctx.status(204);
-    }
-
-    public void update(Context ctx) {
-        int id = Integer.parseInt(ctx.pathParam("id"));
-        User user = ctx.bodyAsClass(User.class);
-        users.put(id, user);
-        ctx.status(200);
-    }
-
-}