Index: src/main/java/it/finki/tinki/web/controller/AccountEditController.java
===================================================================
--- src/main/java/it/finki/tinki/web/controller/AccountEditController.java	(revision bd38a558842ebb2aea2de48a93cbe9522759b8ad)
+++ src/main/java/it/finki/tinki/web/controller/AccountEditController.java	(revision bd46dbb1a81113e9e723d93a58b6a29b0080ba17)
@@ -2,16 +2,17 @@
 
 import it.finki.tinki.model.Skill;
-import it.finki.tinki.model.Users.Account;
 import it.finki.tinki.model.Users.Company;
 import it.finki.tinki.model.Users.Team;
 import it.finki.tinki.model.Users.User;
-import it.finki.tinki.model.dto.*;
+import it.finki.tinki.model.dto.register.account.CompanyRegisterDTO;
+import it.finki.tinki.model.dto.register.account.TeamRegisterDTO;
+import it.finki.tinki.model.dto.register.account.UserRegisterDTO;
+import it.finki.tinki.model.dto.response.account.CompanyResponseDTO;
+import it.finki.tinki.model.dto.response.account.TeamResponseDTO;
+import it.finki.tinki.model.dto.response.account.UserResponseDTO;
 import it.finki.tinki.model.enumerator.AccountType;
 import it.finki.tinki.service.AccountService;
 import it.finki.tinki.service.SkillService;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -30,5 +31,5 @@
     }
 
-    @RequestMapping(path = "/user/{id}/{email}")
+    @PostMapping(path = "/user/{id}/{email}")
     public UserResponseDTO editUser(@PathVariable(name = "id") Long id,
                                     @PathVariable(name = "email") String email,
@@ -48,4 +49,5 @@
             userResponseDTO.setEmail(u.getEmail());
             userResponseDTO.setType(AccountType.USER);
+            userResponseDTO.setError(null);
             userResponseDTO.setName(u.getName());
             userResponseDTO.setSurname(u.getSurname());
@@ -59,5 +61,5 @@
     }
 
-    @RequestMapping(path = "/company/{id}/{email}")
+    @PostMapping(path = "/company/{id}/{email}")
     public CompanyResponseDTO editCompany(@PathVariable(name = "id") Long id,
                                           @PathVariable(name = "email") String email,
@@ -73,4 +75,5 @@
             companyResponseDTO.setId(c.getId());
             companyResponseDTO.setEmail(c.getEmail());
+            companyResponseDTO.setError(null);
             companyResponseDTO.setType(AccountType.COMPANY);
             companyResponseDTO.setName(c.getName());
@@ -83,5 +86,5 @@
     }
 
-    @RequestMapping(path = "/team/{id}/{email}")
+    @PostMapping(path = "/team/{id}/{email}")
     public TeamResponseDTO editTeam(@PathVariable(name = "id") Long id,
                                     @PathVariable(name = "email") String email,
@@ -97,4 +100,5 @@
             teamResponseDTO.setId(t.getId());
             teamResponseDTO.setEmail(t.getEmail());
+            teamResponseDTO.setError(null);
             teamResponseDTO.setType(AccountType.TEAM);
             teamResponseDTO.setName(t.getName());
Index: src/main/java/it/finki/tinki/web/controller/LoginController.java
===================================================================
--- src/main/java/it/finki/tinki/web/controller/LoginController.java	(revision bd38a558842ebb2aea2de48a93cbe9522759b8ad)
+++ src/main/java/it/finki/tinki/web/controller/LoginController.java	(revision bd46dbb1a81113e9e723d93a58b6a29b0080ba17)
@@ -1,7 +1,7 @@
 package it.finki.tinki.web.controller;
 
-import it.finki.tinki.model.Jobs.Internship;
-import it.finki.tinki.model.Jobs.Job;
-import it.finki.tinki.model.Jobs.Project;
+import it.finki.tinki.model.Work.Internship;
+import it.finki.tinki.model.Work.Job;
+import it.finki.tinki.model.Work.Project;
 import it.finki.tinki.model.Users.Account;
 import it.finki.tinki.model.Users.Company;
@@ -9,4 +9,11 @@
 import it.finki.tinki.model.Users.User;
 import it.finki.tinki.model.dto.*;
+import it.finki.tinki.model.dto.response.account.LoginResponseDTO;
+import it.finki.tinki.model.dto.response.account.CompanyResponseDTO;
+import it.finki.tinki.model.dto.response.account.TeamResponseDTO;
+import it.finki.tinki.model.dto.response.account.UserResponseDTO;
+import it.finki.tinki.model.dto.response.work.InternshipResponseDTO;
+import it.finki.tinki.model.dto.response.work.JobResponseDTO;
+import it.finki.tinki.model.dto.response.work.ProjectResponseDTO;
 import it.finki.tinki.model.enumerator.AccountType;
 import it.finki.tinki.service.AccountService;
Index: src/main/java/it/finki/tinki/web/controller/RegisterController.java
===================================================================
--- src/main/java/it/finki/tinki/web/controller/RegisterController.java	(revision bd38a558842ebb2aea2de48a93cbe9522759b8ad)
+++ src/main/java/it/finki/tinki/web/controller/RegisterController.java	(revision bd46dbb1a81113e9e723d93a58b6a29b0080ba17)
@@ -3,7 +3,7 @@
 import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Users.Account;
-import it.finki.tinki.model.dto.CompanyRegisterDTO;
-import it.finki.tinki.model.dto.TeamRegisterDTO;
-import it.finki.tinki.model.dto.UserRegisterDTO;
+import it.finki.tinki.model.dto.register.account.CompanyRegisterDTO;
+import it.finki.tinki.model.dto.register.account.TeamRegisterDTO;
+import it.finki.tinki.model.dto.register.account.UserRegisterDTO;
 import it.finki.tinki.service.AccountService;
 import it.finki.tinki.service.MatchmakerService;
Index: src/main/java/it/finki/tinki/web/controller/WorkEditController.java
===================================================================
--- src/main/java/it/finki/tinki/web/controller/WorkEditController.java	(revision bd38a558842ebb2aea2de48a93cbe9522759b8ad)
+++ 	(revision )
@@ -1,10 +1,0 @@
-package it.finki.tinki.web.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping(path = "/api/edit/work")
-public class WorkEditController {
-
-}
Index: src/main/java/it/finki/tinki/web/controller/WorkRegisterController.java
===================================================================
--- src/main/java/it/finki/tinki/web/controller/WorkRegisterController.java	(revision bd46dbb1a81113e9e723d93a58b6a29b0080ba17)
+++ src/main/java/it/finki/tinki/web/controller/WorkRegisterController.java	(revision bd46dbb1a81113e9e723d93a58b6a29b0080ba17)
@@ -0,0 +1,17 @@
+package it.finki.tinki.web.controller;
+
+import it.finki.tinki.model.dto.response.work.JobResponseDTO;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(path = "/api/register/work")
+public class WorkRegisterController {
+
+//    @PostMapping("/job")
+//    public JobResponseDTO registerJob(@RequestBody JobRegisterDTO body){
+//
+//    }
+}
