diff --git a/java/services/auth/src/main/java/com/uva/authentication/AuthenticationApplication.java b/java/services/auth/src/main/java/com/uva/api/auth/AuthenticationApplication.java
similarity index 90%
rename from java/services/auth/src/main/java/com/uva/authentication/AuthenticationApplication.java
rename to java/services/auth/src/main/java/com/uva/api/auth/AuthenticationApplication.java
index 7b4cb3cd886885343249e97189a911ef42014655..58a58d1a4fe6d2257e1086d9d8b3205e3dec01df 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/AuthenticationApplication.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/AuthenticationApplication.java
@@ -1,4 +1,4 @@
-package com.uva.authentication;
+package com.uva.api.auth;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/java/services/auth/src/main/java/com/uva/authentication/api/UserAPI.java b/java/services/auth/src/main/java/com/uva/api/auth/api/UserAPI.java
similarity index 94%
rename from java/services/auth/src/main/java/com/uva/authentication/api/UserAPI.java
rename to java/services/auth/src/main/java/com/uva/api/auth/api/UserAPI.java
index 6e6edce0ba5517325df77ca6c58b257f24fcb766..56070b8515299ddcf4f412333247c6053d59f898 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/api/UserAPI.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/api/UserAPI.java
@@ -1,4 +1,4 @@
-package com.uva.authentication.api;
+package com.uva.api.auth.api;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,8 +11,8 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 
-import com.uva.authentication.models.auth.RegisterRequest;
-import com.uva.authentication.models.remote.User;
+import com.uva.api.auth.models.auth.RegisterRequest;
+import com.uva.api.auth.models.remote.User;
 
 @Component
 public class UserAPI {
diff --git a/java/services/auth/src/main/java/com/uva/authentication/config/RestTemplateConfig.java b/java/services/auth/src/main/java/com/uva/api/auth/config/RestTemplateConfig.java
similarity index 93%
rename from java/services/auth/src/main/java/com/uva/authentication/config/RestTemplateConfig.java
rename to java/services/auth/src/main/java/com/uva/api/auth/config/RestTemplateConfig.java
index dbcefe7ec34f65cca38b60db09be7355a98b73a7..3120f8ea70d18aaa6ce5d3dfe478bd6ba12d31c9 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/config/RestTemplateConfig.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/config/RestTemplateConfig.java
@@ -1,4 +1,4 @@
-package com.uva.authentication.config;
+package com.uva.api.auth.config;
 
 import java.util.List;
 
diff --git a/java/services/auth/src/main/java/com/uva/authentication/config/RestTemplateInterceptor.java b/java/services/auth/src/main/java/com/uva/api/auth/config/RestTemplateInterceptor.java
similarity index 92%
rename from java/services/auth/src/main/java/com/uva/authentication/config/RestTemplateInterceptor.java
rename to java/services/auth/src/main/java/com/uva/api/auth/config/RestTemplateInterceptor.java
index 25b59946b262e6e8026f5f05ebd098e7dc9674be..86c3b72a95b7ee0e397f794639cffc8c49dd318a 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/config/RestTemplateInterceptor.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/config/RestTemplateInterceptor.java
@@ -1,4 +1,4 @@
-package com.uva.authentication.config;
+package com.uva.api.auth.config;
 
 import org.springframework.http.HttpRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,7 +8,7 @@ import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.stereotype.Component;
 
-import com.uva.authentication.utils.JwtUtil;
+import com.uva.api.auth.utils.JwtUtil;
 
 import java.io.IOException;
 
diff --git a/java/services/auth/src/main/java/com/uva/authentication/controllers/AuthController.java b/java/services/auth/src/main/java/com/uva/api/auth/controllers/AuthController.java
similarity index 92%
rename from java/services/auth/src/main/java/com/uva/authentication/controllers/AuthController.java
rename to java/services/auth/src/main/java/com/uva/api/auth/controllers/AuthController.java
index 0dd5aee61baade3d3da3d14c647f6f8b65108e4d..3b3eef701d582d88f66dac84932d361ae2fbe1e6 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/controllers/AuthController.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/controllers/AuthController.java
@@ -1,4 +1,4 @@
-package com.uva.authentication.controllers;
+package com.uva.api.auth.controllers;
 
 import java.util.Map;
 
@@ -8,9 +8,10 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
 
-import com.uva.authentication.models.auth.LoginRequest;
-import com.uva.authentication.models.auth.RegisterRequest;
-import com.uva.authentication.services.AuthService;
+import com.uva.api.auth.models.auth.LoginRequest;
+import com.uva.api.auth.models.auth.RegisterRequest;
+import com.uva.api.auth.services.AuthService;
+
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
diff --git a/java/services/auth/src/main/java/com/uva/authentication/controllers/TokenController.java b/java/services/auth/src/main/java/com/uva/api/auth/controllers/TokenController.java
similarity index 90%
rename from java/services/auth/src/main/java/com/uva/authentication/controllers/TokenController.java
rename to java/services/auth/src/main/java/com/uva/api/auth/controllers/TokenController.java
index 9f53758bd479d16346bab7845003d97500d5f1ea..c4a050504cf657f5664959776044e6ebe9903545 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/controllers/TokenController.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/controllers/TokenController.java
@@ -1,4 +1,4 @@
-package com.uva.authentication.controllers;
+package com.uva.api.auth.controllers;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.uva.authentication.models.jwt.JwtAuth;
-import com.uva.authentication.services.TokenService;
+import com.uva.api.auth.models.jwt.JwtAuth;
+import com.uva.api.auth.services.TokenService;
 
 @RestController
 @RequestMapping("token")
diff --git a/java/services/auth/src/main/java/com/uva/authentication/models/auth/LoginRequest.java b/java/services/auth/src/main/java/com/uva/api/auth/models/auth/LoginRequest.java
similarity index 87%
rename from java/services/auth/src/main/java/com/uva/authentication/models/auth/LoginRequest.java
rename to java/services/auth/src/main/java/com/uva/api/auth/models/auth/LoginRequest.java
index d40def52cc5de07b7954d64a5a80a04a372fcd23..5e5e6d4437956b5a489e3bbd4e9f19fb56671570 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/models/auth/LoginRequest.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/models/auth/LoginRequest.java
@@ -1,4 +1,4 @@
-package com.uva.authentication.models.auth;
+package com.uva.api.auth.models.auth;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/java/services/auth/src/main/java/com/uva/authentication/models/auth/RegisterRequest.java b/java/services/auth/src/main/java/com/uva/api/auth/models/auth/RegisterRequest.java
similarity index 75%
rename from java/services/auth/src/main/java/com/uva/authentication/models/auth/RegisterRequest.java
rename to java/services/auth/src/main/java/com/uva/api/auth/models/auth/RegisterRequest.java
index 3f992846c754e83a74d74a048719113965d090dd..55b71f22de9f3267217edce3b07fede715f8958f 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/models/auth/RegisterRequest.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/models/auth/RegisterRequest.java
@@ -1,6 +1,6 @@
-package com.uva.authentication.models.auth;
+package com.uva.api.auth.models.auth;
 
-import com.uva.authentication.models.remote.UserRol;
+import com.uva.api.auth.models.remote.UserRol;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/java/services/auth/src/main/java/com/uva/authentication/models/jwt/JwtAuth.java b/java/services/auth/src/main/java/com/uva/api/auth/models/jwt/JwtAuth.java
similarity index 84%
rename from java/services/auth/src/main/java/com/uva/authentication/models/jwt/JwtAuth.java
rename to java/services/auth/src/main/java/com/uva/api/auth/models/jwt/JwtAuth.java
index 6470edf8ea5ed9987ea0f139ad8d0c240dce125f..2b48e39bdab1214bf2ff7147d2134c83cac104ac 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/models/jwt/JwtAuth.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/models/jwt/JwtAuth.java
@@ -1,4 +1,4 @@
-package com.uva.authentication.models.jwt;
+package com.uva.api.auth.models.jwt;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/java/services/auth/src/main/java/com/uva/authentication/models/jwt/JwtData.java b/java/services/auth/src/main/java/com/uva/api/auth/models/jwt/JwtData.java
similarity index 95%
rename from java/services/auth/src/main/java/com/uva/authentication/models/jwt/JwtData.java
rename to java/services/auth/src/main/java/com/uva/api/auth/models/jwt/JwtData.java
index 044482aa1eef6b1ac8d900730480396d8e8e63ad..b6c539570679a874aadb27e034fb6f4cbfff3018 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/models/jwt/JwtData.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/models/jwt/JwtData.java
@@ -1,11 +1,11 @@
-package com.uva.authentication.models.jwt;
+package com.uva.api.auth.models.jwt;
 
 import java.lang.reflect.Field;
 import java.util.Date;
 
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
-import com.uva.authentication.models.remote.UserRol;
+import com.uva.api.auth.models.remote.UserRol;
 
 import lombok.Data;
 import lombok.Getter;
diff --git a/java/services/auth/src/main/java/com/uva/authentication/models/remote/User.java b/java/services/auth/src/main/java/com/uva/api/auth/models/remote/User.java
similarity index 81%
rename from java/services/auth/src/main/java/com/uva/authentication/models/remote/User.java
rename to java/services/auth/src/main/java/com/uva/api/auth/models/remote/User.java
index 91c82e14c7122cd4b7931033118edfa80d8ea8af..2e987d215d4554667367593495b1e65dc2d01591 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/models/remote/User.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/models/remote/User.java
@@ -1,6 +1,6 @@
-package com.uva.authentication.models.remote;
+package com.uva.api.auth.models.remote;
 
-import com.uva.authentication.models.auth.RegisterRequest;
+import com.uva.api.auth.models.auth.RegisterRequest;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/java/services/auth/src/main/java/com/uva/authentication/models/remote/UserRol.java b/java/services/auth/src/main/java/com/uva/api/auth/models/remote/UserRol.java
similarity index 54%
rename from java/services/auth/src/main/java/com/uva/authentication/models/remote/UserRol.java
rename to java/services/auth/src/main/java/com/uva/api/auth/models/remote/UserRol.java
index fe4d90dd1dd595f4c09ec699b452910352b406d5..2840aff9dad9a48276102f1ddd993f7318698821 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/models/remote/UserRol.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/models/remote/UserRol.java
@@ -1,4 +1,4 @@
-package com.uva.authentication.models.remote;
+package com.uva.api.auth.models.remote;
 
 public enum UserRol {
   ADMIN, HOTEL_ADMIN, CLIENT
diff --git a/java/services/auth/src/main/java/com/uva/authentication/services/AuthService.java b/java/services/auth/src/main/java/com/uva/api/auth/services/AuthService.java
similarity index 89%
rename from java/services/auth/src/main/java/com/uva/authentication/services/AuthService.java
rename to java/services/auth/src/main/java/com/uva/api/auth/services/AuthService.java
index d9c00044d4ce773b57a53848e0b925d71484377c..fc48435de58e8fe9960f2a742ac63093c81d3786 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/services/AuthService.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/services/AuthService.java
@@ -1,4 +1,4 @@
-package com.uva.authentication.services;
+package com.uva.api.auth.services;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,14 +7,14 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
 
-import com.uva.authentication.api.UserAPI;
-import com.uva.authentication.models.auth.LoginRequest;
-import com.uva.authentication.models.auth.RegisterRequest;
-import com.uva.authentication.models.jwt.JwtAuth;
-import com.uva.authentication.models.jwt.JwtData;
-import com.uva.authentication.models.remote.User;
-import com.uva.authentication.utils.JwtUtil;
-import com.uva.authentication.utils.SecurityUtils;
+import com.uva.api.auth.api.UserAPI;
+import com.uva.api.auth.models.auth.LoginRequest;
+import com.uva.api.auth.models.auth.RegisterRequest;
+import com.uva.api.auth.models.jwt.JwtAuth;
+import com.uva.api.auth.models.jwt.JwtData;
+import com.uva.api.auth.models.remote.User;
+import com.uva.api.auth.utils.JwtUtil;
+import com.uva.api.auth.utils.SecurityUtils;
 
 @Service
 public class AuthService {
diff --git a/java/services/auth/src/main/java/com/uva/authentication/services/TokenService.java b/java/services/auth/src/main/java/com/uva/api/auth/services/TokenService.java
similarity index 83%
rename from java/services/auth/src/main/java/com/uva/authentication/services/TokenService.java
rename to java/services/auth/src/main/java/com/uva/api/auth/services/TokenService.java
index f49fcd0a35580ceeec1f100ced21c7240e4fbd01..522a396e01a004647363dc22e0ca653add969250 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/services/TokenService.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/services/TokenService.java
@@ -1,13 +1,13 @@
-package com.uva.authentication.services;
+package com.uva.api.auth.services;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import com.uva.authentication.models.jwt.JwtAuth;
-import com.uva.authentication.models.jwt.JwtData;
-import com.uva.authentication.utils.JwtUtil;
+import com.uva.api.auth.models.jwt.JwtAuth;
+import com.uva.api.auth.models.jwt.JwtData;
+import com.uva.api.auth.utils.JwtUtil;
 
 @Service
 public class TokenService {
diff --git a/java/services/auth/src/main/java/com/uva/authentication/utils/JwtUtil.java b/java/services/auth/src/main/java/com/uva/api/auth/utils/JwtUtil.java
similarity index 95%
rename from java/services/auth/src/main/java/com/uva/authentication/utils/JwtUtil.java
rename to java/services/auth/src/main/java/com/uva/api/auth/utils/JwtUtil.java
index d84db0a991c8f12863dcfc7fae793f989e86160b..bb05964bada6ddc069f9cdec63432fb85f991f81 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/utils/JwtUtil.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/utils/JwtUtil.java
@@ -1,4 +1,4 @@
-package com.uva.authentication.utils;
+package com.uva.api.auth.utils;
 
 import java.util.Date;
 import org.springframework.beans.factory.annotation.Value;
@@ -8,10 +8,9 @@ import org.springframework.web.client.HttpClientErrorException;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
-import com.uva.authentication.models.jwt.JwtData;
-import com.uva.authentication.models.remote.User;
-
 import com.auth0.jwt.interfaces.DecodedJWT;
+import com.uva.api.auth.models.jwt.JwtData;
+import com.uva.api.auth.models.remote.User;
 
 import java.time.Instant;
 
diff --git a/java/services/auth/src/main/java/com/uva/authentication/utils/SecurityUtils.java b/java/services/auth/src/main/java/com/uva/api/auth/utils/SecurityUtils.java
similarity index 92%
rename from java/services/auth/src/main/java/com/uva/authentication/utils/SecurityUtils.java
rename to java/services/auth/src/main/java/com/uva/api/auth/utils/SecurityUtils.java
index 2df069eabbe53bdeaccbdbd58094bf8022ff35c7..20bda4a719f150f966ab80128bdade3c31fab398 100644
--- a/java/services/auth/src/main/java/com/uva/authentication/utils/SecurityUtils.java
+++ b/java/services/auth/src/main/java/com/uva/api/auth/utils/SecurityUtils.java
@@ -1,4 +1,4 @@
-package com.uva.authentication.utils;
+package com.uva.api.auth.utils;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
@@ -14,5 +14,5 @@ public class SecurityUtils {
   public static boolean checkPassword(String rawPassword, String encodedPassword) {
     return encoder.matches(rawPassword, encodedPassword); // Comparar la contraseña con el hash
   }
-  
+
 }
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/BookingsApplication.java b/java/services/bookings/src/main/java/com/uva/api/bookings/BookingsApplication.java
similarity index 90%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/BookingsApplication.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/BookingsApplication.java
index f66cf7f45d80b539ed6686c9bdbdcf5167542ee4..41ff3308e275242e3e6bde32bda722a467e80fcd 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/BookingsApplication.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/BookingsApplication.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings;
+package com.uva.api.bookings;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/api/HotelApi.java b/java/services/bookings/src/main/java/com/uva/api/bookings/api/HotelApi.java
similarity index 96%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/api/HotelApi.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/api/HotelApi.java
index 451e4cf6cd702d5aee194295a35d4df51a470e3b..4ed7a2991e0f98761bbb2dd78085dafdbf6344c3 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/api/HotelApi.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/api/HotelApi.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.api;
+package com.uva.api.bookings.api;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/api/TokenAPI.java b/java/services/bookings/src/main/java/com/uva/api/bookings/api/TokenAPI.java
similarity index 92%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/api/TokenAPI.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/api/TokenAPI.java
index 41572b931b7b5137479b916ddb45361e8ad4dbc6..e32f88a29d3c6218814ac72ad2a74f2c1fa9073f 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/api/TokenAPI.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/api/TokenAPI.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.api;
+package com.uva.api.bookings.api;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.uva.apis.bookings.models.external.JwtData;
+import com.uva.api.bookings.models.external.JwtData;
 
 @Component
 public class TokenAPI {
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/api/UserApi.java b/java/services/bookings/src/main/java/com/uva/api/bookings/api/UserApi.java
similarity index 97%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/api/UserApi.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/api/UserApi.java
index 241e9578429297bbb42129e2bd816fb0eacd5d6f..6e916340eda652e42cd7136ed29a49834e9eebfa 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/api/UserApi.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/api/UserApi.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.api;
+package com.uva.api.bookings.api;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/config/RestTemplateConfig.java b/java/services/bookings/src/main/java/com/uva/api/bookings/config/RestTemplateConfig.java
similarity index 88%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/config/RestTemplateConfig.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/config/RestTemplateConfig.java
index b1cabd54856c88261462cf23e0fb7fb73cd2220d..311a06210acbb276aa6ee850bfa8838e00bb55f3 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/config/RestTemplateConfig.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/config/RestTemplateConfig.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.config;
+package com.uva.api.bookings.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/config/RestTemplateInterceptor.java b/java/services/bookings/src/main/java/com/uva/api/bookings/config/RestTemplateInterceptor.java
similarity index 90%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/config/RestTemplateInterceptor.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/config/RestTemplateInterceptor.java
index 8ede6ebd5b8d6575db2734fd1bfb44d65a3a5026..8c14c825473c45cff9ced07024be394bbb716099 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/config/RestTemplateInterceptor.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/config/RestTemplateInterceptor.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.config;
+package com.uva.api.bookings.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpRequest;
@@ -7,7 +7,8 @@ import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.stereotype.Component;
 
-import com.uva.apis.bookings.services.TokenService;
+import com.uva.api.bookings.services.TokenService;
+
 import java.io.IOException;
 
 @Component
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/config/SecurityConfig.java b/java/services/bookings/src/main/java/com/uva/api/bookings/config/SecurityConfig.java
similarity index 93%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/config/SecurityConfig.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/config/SecurityConfig.java
index 1b2ffd6bf039fc0d70efb5b918ecda0b8236433f..1720a0e86ef53248b85d064a2fb559cb18eb21f0 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/config/SecurityConfig.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/config/SecurityConfig.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.config;
+package com.uva.api.bookings.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -8,8 +8,8 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
-import com.uva.apis.bookings.filter.JwtAuthenticationFilter;
-import com.uva.apis.bookings.models.external.users.UserRol;
+import com.uva.api.bookings.filter.JwtAuthenticationFilter;
+import com.uva.api.bookings.models.external.users.UserRol;
 
 @Configuration
 @EnableWebSecurity
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/controllers/BookingController.java b/java/services/bookings/src/main/java/com/uva/api/bookings/controllers/BookingController.java
similarity index 92%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/controllers/BookingController.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/controllers/BookingController.java
index 6c192ac71f34575801e3f73773ebd86de18ea07b..2a8967a0840c7e86ae1b5b07d270b7f737b4e38b 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/controllers/BookingController.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/controllers/BookingController.java
@@ -1,11 +1,11 @@
-package com.uva.apis.bookings.controllers;
+package com.uva.api.bookings.controllers;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import com.uva.apis.bookings.models.Booking;
-import com.uva.apis.bookings.services.BookingService;
+import com.uva.api.bookings.models.Booking;
+import com.uva.api.bookings.services.BookingService;
 
 import java.time.LocalDate;
 
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/exceptions/BookingNotFoundException.java b/java/services/bookings/src/main/java/com/uva/api/bookings/exceptions/BookingNotFoundException.java
similarity index 89%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/exceptions/BookingNotFoundException.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/exceptions/BookingNotFoundException.java
index c716efb51487cce086ce8237b2c2a11c5313b045..88557e82abeae5cbd97eec381ac7fbcf757ab01f 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/exceptions/BookingNotFoundException.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/exceptions/BookingNotFoundException.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.exceptions;
+package com.uva.api.bookings.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/exceptions/GlobalExceptionHandler.java b/java/services/bookings/src/main/java/com/uva/api/bookings/exceptions/GlobalExceptionHandler.java
similarity index 97%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/exceptions/GlobalExceptionHandler.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/exceptions/GlobalExceptionHandler.java
index d54bec5f3b09e3a33356ae3a199de273979396f3..b53333d1ce602da5343654e58643eb5278d272b1 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/exceptions/GlobalExceptionHandler.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/exceptions/GlobalExceptionHandler.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.exceptions;
+package com.uva.api.bookings.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/exceptions/InvalidDateRangeException.java b/java/services/bookings/src/main/java/com/uva/api/bookings/exceptions/InvalidDateRangeException.java
similarity index 78%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/exceptions/InvalidDateRangeException.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/exceptions/InvalidDateRangeException.java
index 193ebdf2fbea7c68c52327b8dbffaf9ff5fbd51a..3a232ecb1ed45ee36f14578f76727cd81d340db1 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/exceptions/InvalidDateRangeException.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/exceptions/InvalidDateRangeException.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.exceptions;
+package com.uva.api.bookings.exceptions;
 
 public class InvalidDateRangeException extends RuntimeException {
     public InvalidDateRangeException(String message) {
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/filter/JwtAuthenticationFilter.java b/java/services/bookings/src/main/java/com/uva/api/bookings/filter/JwtAuthenticationFilter.java
similarity index 94%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/filter/JwtAuthenticationFilter.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/filter/JwtAuthenticationFilter.java
index 2a33fdbf41863fe2b3069a1958053cb49c217f4c..40f3b976ab10e18eada94cc231b38fd9cd29ec4a 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/filter/JwtAuthenticationFilter.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/filter/JwtAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.filter;
+package com.uva.api.bookings.filter;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -8,9 +8,9 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.stereotype.Component;
 
-import com.uva.apis.bookings.models.external.JwtData;
-import com.uva.apis.bookings.models.external.users.UserRol;
-import com.uva.apis.bookings.services.TokenService;
+import com.uva.api.bookings.models.external.JwtData;
+import com.uva.api.bookings.models.external.users.UserRol;
+import com.uva.api.bookings.services.TokenService;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/models/Booking.java b/java/services/bookings/src/main/java/com/uva/api/bookings/models/Booking.java
similarity index 96%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/models/Booking.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/models/Booking.java
index fef5edc8c76b692b67e67c4117064b134a0226c6..f6a033b0bba44fdf0fcb904987b174d1a60dfb32 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/models/Booking.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/models/Booking.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.models;
+package com.uva.api.bookings.models;
 
 import jakarta.persistence.Basic;
 import jakarta.persistence.Column;
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/models/external/JwtData.java b/java/services/bookings/src/main/java/com/uva/api/bookings/models/external/JwtData.java
similarity index 83%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/models/external/JwtData.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/models/external/JwtData.java
index c37ab2db05e56d399cbf3b08fe72ec7b96160a87..8d9805347a96034f926d0a78f41f76def818ac5d 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/models/external/JwtData.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/models/external/JwtData.java
@@ -1,8 +1,8 @@
-package com.uva.apis.bookings.models.external;
+package com.uva.api.bookings.models.external;
 
 import java.util.Date;
 
-import com.uva.apis.bookings.models.external.users.UserRol;
+import com.uva.api.bookings.models.external.users.UserRol;
 
 import lombok.Data;
 import lombok.Getter;
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/models/external/users/UserRol.java b/java/services/bookings/src/main/java/com/uva/api/bookings/models/external/users/UserRol.java
similarity index 50%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/models/external/users/UserRol.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/models/external/users/UserRol.java
index 60cbc5cdaa7ab4aa01db819e8e517ffb7733dc9d..08f1f40dbed9870b29703925495b3b58d77403eb 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/models/external/users/UserRol.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/models/external/users/UserRol.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.models.external.users;
+package com.uva.api.bookings.models.external.users;
 
 public enum UserRol {
   ADMIN, HOTEL_ADMIN, CLIENT
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/repositories/BookingRepository.java b/java/services/bookings/src/main/java/com/uva/api/bookings/repositories/BookingRepository.java
similarity index 94%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/repositories/BookingRepository.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/repositories/BookingRepository.java
index 971dcdcf8f5eae6617123f6ef64d387838e1ed78..111ede8ec1e4a3d499f1ded23519ea6f18afcfac 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/repositories/BookingRepository.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/repositories/BookingRepository.java
@@ -1,5 +1,5 @@
 // BookingRepository.java
-package com.uva.apis.bookings.repositories;
+package com.uva.api.bookings.repositories;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -8,7 +8,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import com.uva.apis.bookings.models.Booking;
+import com.uva.api.bookings.models.Booking;
 
 import jakarta.transaction.Transactional;
 
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/services/BookingService.java b/java/services/bookings/src/main/java/com/uva/api/bookings/services/BookingService.java
similarity index 94%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/services/BookingService.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/services/BookingService.java
index 74fc741548554fb7061f3f5e0569a8e7e2ce9ad6..96c916837f897676bb6829b31dbdd0f86e285136 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/services/BookingService.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/services/BookingService.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.services;
+package com.uva.api.bookings.services;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -6,12 +6,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
 
-import com.uva.apis.bookings.api.HotelApi;
-import com.uva.apis.bookings.exceptions.BookingNotFoundException;
-import com.uva.apis.bookings.exceptions.InvalidDateRangeException;
-import com.uva.apis.bookings.api.UserApi;
-import com.uva.apis.bookings.models.Booking;
-import com.uva.apis.bookings.repositories.BookingRepository;
+import com.uva.api.bookings.api.HotelApi;
+import com.uva.api.bookings.api.UserApi;
+import com.uva.api.bookings.exceptions.BookingNotFoundException;
+import com.uva.api.bookings.exceptions.InvalidDateRangeException;
+import com.uva.api.bookings.models.Booking;
+import com.uva.api.bookings.repositories.BookingRepository;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
diff --git a/java/services/bookings/src/main/java/com/uva/apis/bookings/services/TokenService.java b/java/services/bookings/src/main/java/com/uva/api/bookings/services/TokenService.java
similarity index 90%
rename from java/services/bookings/src/main/java/com/uva/apis/bookings/services/TokenService.java
rename to java/services/bookings/src/main/java/com/uva/api/bookings/services/TokenService.java
index 912fd3a49244aea8701e569e29ee72f8729d8469..e5cefeff4cdc6afa92f75497bdbd110fa327de21 100644
--- a/java/services/bookings/src/main/java/com/uva/apis/bookings/services/TokenService.java
+++ b/java/services/bookings/src/main/java/com/uva/api/bookings/services/TokenService.java
@@ -1,4 +1,4 @@
-package com.uva.apis.bookings.services;
+package com.uva.api.bookings.services;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,8 +6,8 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.uva.apis.bookings.api.TokenAPI;
-import com.uva.apis.bookings.models.external.JwtData;
+import com.uva.api.bookings.api.TokenAPI;
+import com.uva.api.bookings.models.external.JwtData;
 
 @Service
 public class TokenService {
diff --git a/java/services/users/src/main/java/com/uva/api/UsersApplication.java b/java/services/users/src/main/java/com/uva/api/users/UsersApplication.java
similarity index 91%
rename from java/services/users/src/main/java/com/uva/api/UsersApplication.java
rename to java/services/users/src/main/java/com/uva/api/users/UsersApplication.java
index ec976f06cf1fa19f246111442120682cfaa0df88..9d52f230bb4f9df2d816cce35bc2d3f92013b06f 100644
--- a/java/services/users/src/main/java/com/uva/api/UsersApplication.java
+++ b/java/services/users/src/main/java/com/uva/api/users/UsersApplication.java
@@ -1,4 +1,4 @@
-package com.uva.api;
+package com.uva.api.users;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/java/services/users/src/main/java/com/uva/api/apis/BookingAPI.java b/java/services/users/src/main/java/com/uva/api/users/api/BookingAPI.java
similarity index 90%
rename from java/services/users/src/main/java/com/uva/api/apis/BookingAPI.java
rename to java/services/users/src/main/java/com/uva/api/users/api/BookingAPI.java
index aafffb5094fa3cf1fad685bdb02b889ffbc107e9..2ff83c6b430709200791371f0cf1d354d123e867 100644
--- a/java/services/users/src/main/java/com/uva/api/apis/BookingAPI.java
+++ b/java/services/users/src/main/java/com/uva/api/users/api/BookingAPI.java
@@ -1,4 +1,4 @@
-package com.uva.api.apis;
+package com.uva.api.users.api;
 
 import java.util.Arrays;
 import java.util.List;
@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
-import com.uva.api.models.remote.Booking;
+import com.uva.api.users.models.remote.Booking;
 
 @Component
 public class BookingAPI {
diff --git a/java/services/users/src/main/java/com/uva/api/apis/HotelApi.java b/java/services/users/src/main/java/com/uva/api/users/api/HotelApi.java
similarity index 94%
rename from java/services/users/src/main/java/com/uva/api/apis/HotelApi.java
rename to java/services/users/src/main/java/com/uva/api/users/api/HotelApi.java
index c6541c58c931cfba57ecc717e1c43bea8fd64a40..c628922f05670c5830bfa1a2bfded9cfa70e3d1b 100644
--- a/java/services/users/src/main/java/com/uva/api/apis/HotelApi.java
+++ b/java/services/users/src/main/java/com/uva/api/users/api/HotelApi.java
@@ -1,4 +1,4 @@
-package com.uva.api.apis;
+package com.uva.api.users.api;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/java/services/users/src/main/java/com/uva/api/apis/TokenAPI.java b/java/services/users/src/main/java/com/uva/api/users/api/TokenAPI.java
similarity index 93%
rename from java/services/users/src/main/java/com/uva/api/apis/TokenAPI.java
rename to java/services/users/src/main/java/com/uva/api/users/api/TokenAPI.java
index 01941ad762dfdfc3128583d0de2d4680d41b480f..66215f63fc629247a7d59e0eef57c3fe6089824f 100644
--- a/java/services/users/src/main/java/com/uva/api/apis/TokenAPI.java
+++ b/java/services/users/src/main/java/com/uva/api/users/api/TokenAPI.java
@@ -1,4 +1,4 @@
-package com.uva.api.apis;
+package com.uva.api.users.api;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.uva.api.models.remote.JwtData;
+import com.uva.api.users.models.remote.JwtData;
 
 @Component
 public class TokenAPI {
diff --git a/java/services/users/src/main/java/com/uva/api/config/RestTemplateConfig.java b/java/services/users/src/main/java/com/uva/api/users/config/RestTemplateConfig.java
similarity index 89%
rename from java/services/users/src/main/java/com/uva/api/config/RestTemplateConfig.java
rename to java/services/users/src/main/java/com/uva/api/users/config/RestTemplateConfig.java
index 1af44e14ff425b48475f1dea6c9736d2355efc81..973ba41dcc1f515f30bbee321df2c7955af5c9d7 100644
--- a/java/services/users/src/main/java/com/uva/api/config/RestTemplateConfig.java
+++ b/java/services/users/src/main/java/com/uva/api/users/config/RestTemplateConfig.java
@@ -1,4 +1,4 @@
-package com.uva.api.config;
+package com.uva.api.users.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/java/services/users/src/main/java/com/uva/api/config/RestTemplateInterceptor.java b/java/services/users/src/main/java/com/uva/api/users/config/RestTemplateInterceptor.java
similarity index 91%
rename from java/services/users/src/main/java/com/uva/api/config/RestTemplateInterceptor.java
rename to java/services/users/src/main/java/com/uva/api/users/config/RestTemplateInterceptor.java
index 7a6e85f4c3fcfa7d8ce890130417e5807a9124ce..eae1ed2957c822bc08c2e7d99759b71e56dfa64d 100644
--- a/java/services/users/src/main/java/com/uva/api/config/RestTemplateInterceptor.java
+++ b/java/services/users/src/main/java/com/uva/api/users/config/RestTemplateInterceptor.java
@@ -1,4 +1,4 @@
-package com.uva.api.config;
+package com.uva.api.users.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpRequest;
@@ -7,7 +7,7 @@ import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.stereotype.Component;
 
-import com.uva.api.services.TokenService;
+import com.uva.api.users.services.TokenService;
 
 import java.io.IOException;
 
diff --git a/java/services/users/src/main/java/com/uva/api/config/SecurityConfig.java b/java/services/users/src/main/java/com/uva/api/users/config/SecurityConfig.java
similarity index 94%
rename from java/services/users/src/main/java/com/uva/api/config/SecurityConfig.java
rename to java/services/users/src/main/java/com/uva/api/users/config/SecurityConfig.java
index d9720e394866dadef3daa91b42a659cf01d25885..10b87150725c794692d25dd27e239a71dbf8e905 100644
--- a/java/services/users/src/main/java/com/uva/api/config/SecurityConfig.java
+++ b/java/services/users/src/main/java/com/uva/api/users/config/SecurityConfig.java
@@ -1,4 +1,4 @@
-package com.uva.api.config;
+package com.uva.api.users.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -8,8 +8,8 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
-import com.uva.api.filter.JwtAuthenticationFilter;
-import com.uva.api.models.UserRol;
+import com.uva.api.users.filter.JwtAuthenticationFilter;
+import com.uva.api.users.models.UserRol;
 
 @Configuration
 @EnableWebSecurity
diff --git a/java/services/users/src/main/java/com/uva/api/controllers/ClientController.java b/java/services/users/src/main/java/com/uva/api/users/controllers/ClientController.java
similarity index 94%
rename from java/services/users/src/main/java/com/uva/api/controllers/ClientController.java
rename to java/services/users/src/main/java/com/uva/api/users/controllers/ClientController.java
index b0e50a3661aaa6719805f8964aca782d8a39f0d7..afcb4b7f30f5b49fb3b27145944d3a14623f8f42 100644
--- a/java/services/users/src/main/java/com/uva/api/controllers/ClientController.java
+++ b/java/services/users/src/main/java/com/uva/api/users/controllers/ClientController.java
@@ -1,4 +1,4 @@
-package com.uva.api.controllers;
+package com.uva.api.users.controllers;
 
 import java.util.Map;
 
@@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.HttpClientErrorException;
 
-import com.uva.api.models.ClientStatus;
-import com.uva.api.services.ClientService;
+import com.uva.api.users.models.ClientStatus;
+import com.uva.api.users.services.ClientService;
 
 @RestController
 @RequestMapping("users/clients")
diff --git a/java/services/users/src/main/java/com/uva/api/controllers/ManagerController.java b/java/services/users/src/main/java/com/uva/api/users/controllers/ManagerController.java
similarity index 91%
rename from java/services/users/src/main/java/com/uva/api/controllers/ManagerController.java
rename to java/services/users/src/main/java/com/uva/api/users/controllers/ManagerController.java
index d5af94d7079356035a34268b2f0e7d7067969fd7..31cdca4afbab1739d5dfaeed9d16a18a9491e36e 100644
--- a/java/services/users/src/main/java/com/uva/api/controllers/ManagerController.java
+++ b/java/services/users/src/main/java/com/uva/api/users/controllers/ManagerController.java
@@ -1,4 +1,4 @@
-package com.uva.api.controllers;
+package com.uva.api.users.controllers;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.HttpClientErrorException;
 
-import com.uva.api.models.Manager;
-import com.uva.api.services.ManagerService;
+import com.uva.api.users.models.Manager;
+import com.uva.api.users.services.ManagerService;
 
 @RestController
 @RequestMapping("users/managers")
diff --git a/java/services/users/src/main/java/com/uva/api/controllers/UserController.java b/java/services/users/src/main/java/com/uva/api/users/controllers/UserController.java
similarity index 95%
rename from java/services/users/src/main/java/com/uva/api/controllers/UserController.java
rename to java/services/users/src/main/java/com/uva/api/users/controllers/UserController.java
index 38cae78c05aac1345b7ee2121f658f639d68c6cc..811785a89b0c668f7c0e50b677b39c579834a20c 100644
--- a/java/services/users/src/main/java/com/uva/api/controllers/UserController.java
+++ b/java/services/users/src/main/java/com/uva/api/users/controllers/UserController.java
@@ -1,4 +1,4 @@
-package com.uva.api.controllers;
+package com.uva.api.users.controllers;
 
 import java.util.Map;
 
@@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.uva.api.models.AuthDTO;
-import com.uva.api.services.UserService;
-import com.uva.api.utils.Utils;
+import com.uva.api.users.models.AuthDTO;
+import com.uva.api.users.services.UserService;
+import com.uva.api.users.utils.Utils;
 
 @RestController
 @RequestMapping("users")
diff --git a/java/services/users/src/main/java/com/uva/api/exceptions/GlobalExceptionHandler.java b/java/services/users/src/main/java/com/uva/api/users/exceptions/GlobalExceptionHandler.java
similarity index 96%
rename from java/services/users/src/main/java/com/uva/api/exceptions/GlobalExceptionHandler.java
rename to java/services/users/src/main/java/com/uva/api/users/exceptions/GlobalExceptionHandler.java
index 426b2fb250097e33499079693c456069dabc801c..4241b4ddddd05649435877f5f8400aed3191f476 100644
--- a/java/services/users/src/main/java/com/uva/api/exceptions/GlobalExceptionHandler.java
+++ b/java/services/users/src/main/java/com/uva/api/users/exceptions/GlobalExceptionHandler.java
@@ -1,4 +1,4 @@
-package com.uva.api.exceptions;
+package com.uva.api.users.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/java/services/users/src/main/java/com/uva/api/exceptions/UserNotFoundException.java b/java/services/users/src/main/java/com/uva/api/users/exceptions/UserNotFoundException.java
similarity index 75%
rename from java/services/users/src/main/java/com/uva/api/exceptions/UserNotFoundException.java
rename to java/services/users/src/main/java/com/uva/api/users/exceptions/UserNotFoundException.java
index 9d12fb2fe156607f5558986e92d513f85b386d6c..df6ee96414026de954f08931724339ff1bddc88e 100644
--- a/java/services/users/src/main/java/com/uva/api/exceptions/UserNotFoundException.java
+++ b/java/services/users/src/main/java/com/uva/api/users/exceptions/UserNotFoundException.java
@@ -1,4 +1,4 @@
-package com.uva.api.exceptions;
+package com.uva.api.users.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
@@ -8,4 +8,8 @@ public class UserNotFoundException extends RuntimeException {
     public UserNotFoundException(int id) {
         super("User not found with id: " + id);
     }
+
+    public UserNotFoundException() {
+        super("User not found");
+    }
 }
diff --git a/java/services/users/src/main/java/com/uva/api/filter/JwtAuthenticationFilter.java b/java/services/users/src/main/java/com/uva/api/users/filter/JwtAuthenticationFilter.java
similarity index 95%
rename from java/services/users/src/main/java/com/uva/api/filter/JwtAuthenticationFilter.java
rename to java/services/users/src/main/java/com/uva/api/users/filter/JwtAuthenticationFilter.java
index 18ef31e44129a2333fdbf7d90b52e9c908e02c8c..c95fa0a53d63fad9f4ee79c53e8df358b66aeae8 100644
--- a/java/services/users/src/main/java/com/uva/api/filter/JwtAuthenticationFilter.java
+++ b/java/services/users/src/main/java/com/uva/api/users/filter/JwtAuthenticationFilter.java
@@ -1,8 +1,4 @@
-package com.uva.api.filter;
-
-import com.uva.api.models.UserRol;
-import com.uva.api.models.remote.JwtData;
-import com.uva.api.services.TokenService;
+package com.uva.api.users.filter;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,6 +8,10 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.stereotype.Component;
 
+import com.uva.api.users.models.UserRol;
+import com.uva.api.users.models.remote.JwtData;
+import com.uva.api.users.services.TokenService;
+
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletRequest;
diff --git a/java/services/users/src/main/java/com/uva/api/models/AuthDTO.java b/java/services/users/src/main/java/com/uva/api/users/models/AuthDTO.java
similarity index 90%
rename from java/services/users/src/main/java/com/uva/api/models/AuthDTO.java
rename to java/services/users/src/main/java/com/uva/api/users/models/AuthDTO.java
index a340fc6852ccc45d1a608ad6a483e0851e88c1fa..dbe04212af18131ea1eb23e2519392cc4a7f56e8 100644
--- a/java/services/users/src/main/java/com/uva/api/models/AuthDTO.java
+++ b/java/services/users/src/main/java/com/uva/api/users/models/AuthDTO.java
@@ -1,4 +1,4 @@
-package com.uva.api.models;
+package com.uva.api.users.models;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/java/services/users/src/main/java/com/uva/api/models/Client.java b/java/services/users/src/main/java/com/uva/api/users/models/Client.java
similarity index 93%
rename from java/services/users/src/main/java/com/uva/api/models/Client.java
rename to java/services/users/src/main/java/com/uva/api/users/models/Client.java
index 71f3a3f207782ca891acfa1cac513ec7fe9fb356..08123c2700d996de628184c997b3868909159b4c 100644
--- a/java/services/users/src/main/java/com/uva/api/models/Client.java
+++ b/java/services/users/src/main/java/com/uva/api/users/models/Client.java
@@ -1,8 +1,8 @@
-package com.uva.api.models;
+package com.uva.api.users.models;
 
 import java.util.List;
 
-import com.uva.api.models.remote.Booking;
+import com.uva.api.users.models.remote.Booking;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/java/services/users/src/main/java/com/uva/api/models/ClientStatus.java b/java/services/users/src/main/java/com/uva/api/users/models/ClientStatus.java
similarity index 72%
rename from java/services/users/src/main/java/com/uva/api/models/ClientStatus.java
rename to java/services/users/src/main/java/com/uva/api/users/models/ClientStatus.java
index 569d754345dcfc5318e079d4989dae9f1e0acf1f..00be7ea369fd4661ba2b8c35bafccd9cd048bf1c 100644
--- a/java/services/users/src/main/java/com/uva/api/models/ClientStatus.java
+++ b/java/services/users/src/main/java/com/uva/api/users/models/ClientStatus.java
@@ -1,4 +1,4 @@
-package com.uva.api.models;
+package com.uva.api.users.models;
 
 public enum ClientStatus {
   NO_BOOKINGS, WITH_ACTIVE_BOOKINGS, WITH_INACTIVE_BOOKINGS;
diff --git a/java/services/users/src/main/java/com/uva/api/models/Manager.java b/java/services/users/src/main/java/com/uva/api/users/models/Manager.java
similarity index 95%
rename from java/services/users/src/main/java/com/uva/api/models/Manager.java
rename to java/services/users/src/main/java/com/uva/api/users/models/Manager.java
index f72e762b13b73585534608c5e3be25b5ed623ba0..eb9fa3107a4a7ad342114c2821e2d6f42ec3a0c9 100644
--- a/java/services/users/src/main/java/com/uva/api/models/Manager.java
+++ b/java/services/users/src/main/java/com/uva/api/users/models/Manager.java
@@ -1,4 +1,4 @@
-package com.uva.api.models;
+package com.uva.api.users.models;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/java/services/users/src/main/java/com/uva/api/models/User.java b/java/services/users/src/main/java/com/uva/api/users/models/User.java
similarity index 97%
rename from java/services/users/src/main/java/com/uva/api/models/User.java
rename to java/services/users/src/main/java/com/uva/api/users/models/User.java
index 401f505bff181e250386defeb8f8bd7d6f477bd4..07f215d24880ef80b10a3042140c9780303f6829 100644
--- a/java/services/users/src/main/java/com/uva/api/models/User.java
+++ b/java/services/users/src/main/java/com/uva/api/users/models/User.java
@@ -1,4 +1,4 @@
-package com.uva.api.models;
+package com.uva.api.users.models;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
diff --git a/java/services/users/src/main/java/com/uva/api/models/UserRol.java b/java/services/users/src/main/java/com/uva/api/users/models/UserRol.java
similarity index 61%
rename from java/services/users/src/main/java/com/uva/api/models/UserRol.java
rename to java/services/users/src/main/java/com/uva/api/users/models/UserRol.java
index 025489bdc52a97346bf055c69115444871ecf4fa..c08fa995db0daeaf7b32fb16cf759b4e20e36adb 100644
--- a/java/services/users/src/main/java/com/uva/api/models/UserRol.java
+++ b/java/services/users/src/main/java/com/uva/api/users/models/UserRol.java
@@ -1,4 +1,4 @@
-package com.uva.api.models;
+package com.uva.api.users.models;
 
 public enum UserRol {
   ADMIN, HOTEL_ADMIN, CLIENT
diff --git a/java/services/users/src/main/java/com/uva/api/models/remote/Booking.java b/java/services/users/src/main/java/com/uva/api/users/models/remote/Booking.java
similarity index 89%
rename from java/services/users/src/main/java/com/uva/api/models/remote/Booking.java
rename to java/services/users/src/main/java/com/uva/api/users/models/remote/Booking.java
index edb2b0656c7a7f487f8c5f4e4465e8c34e4b55cb..6309bbee3002a7a36a2d088478dd09044004b5d0 100644
--- a/java/services/users/src/main/java/com/uva/api/models/remote/Booking.java
+++ b/java/services/users/src/main/java/com/uva/api/users/models/remote/Booking.java
@@ -1,4 +1,4 @@
-package com.uva.api.models.remote;
+package com.uva.api.users.models.remote;
 
 import java.time.LocalDate;
 
diff --git a/java/services/users/src/main/java/com/uva/api/models/remote/JwtData.java b/java/services/users/src/main/java/com/uva/api/users/models/remote/JwtData.java
similarity index 86%
rename from java/services/users/src/main/java/com/uva/api/models/remote/JwtData.java
rename to java/services/users/src/main/java/com/uva/api/users/models/remote/JwtData.java
index 21774c76be754aacdb2005499b96591ce3459fd9..159db9c7dd58b8639ee64e8f8f6d0c23e300ac35 100644
--- a/java/services/users/src/main/java/com/uva/api/models/remote/JwtData.java
+++ b/java/services/users/src/main/java/com/uva/api/users/models/remote/JwtData.java
@@ -1,8 +1,8 @@
-package com.uva.api.models.remote;
+package com.uva.api.users.models.remote;
 
 import java.util.Date;
 
-import com.uva.api.models.UserRol;
+import com.uva.api.users.models.UserRol;
 
 import lombok.Data;
 import lombok.Getter;
diff --git a/java/services/users/src/main/java/com/uva/api/repositories/ClientRepository.java b/java/services/users/src/main/java/com/uva/api/users/repositories/ClientRepository.java
similarity index 72%
rename from java/services/users/src/main/java/com/uva/api/repositories/ClientRepository.java
rename to java/services/users/src/main/java/com/uva/api/users/repositories/ClientRepository.java
index 494b9270ca9df74ea33cdd9d287c27b9af68e12c..f3d2da806b22d9e4db60d6b745d4be7103e18e0c 100644
--- a/java/services/users/src/main/java/com/uva/api/repositories/ClientRepository.java
+++ b/java/services/users/src/main/java/com/uva/api/users/repositories/ClientRepository.java
@@ -1,9 +1,9 @@
-package com.uva.api.repositories;
+package com.uva.api.users.repositories;
 
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.uva.api.models.Client;
+import com.uva.api.users.models.Client;
 
 public interface ClientRepository extends JpaRepository<Client, Integer> {
   Optional<Client> findByEmail(String email);
diff --git a/java/services/users/src/main/java/com/uva/api/repositories/ManagerRepository.java b/java/services/users/src/main/java/com/uva/api/users/repositories/ManagerRepository.java
similarity index 72%
rename from java/services/users/src/main/java/com/uva/api/repositories/ManagerRepository.java
rename to java/services/users/src/main/java/com/uva/api/users/repositories/ManagerRepository.java
index be3fa832926c3fb974a065f22f01f701f8925d6b..46a608f0973119e9c4b3cc1fa8f44c181f5b2afa 100644
--- a/java/services/users/src/main/java/com/uva/api/repositories/ManagerRepository.java
+++ b/java/services/users/src/main/java/com/uva/api/users/repositories/ManagerRepository.java
@@ -1,9 +1,9 @@
-package com.uva.api.repositories;
+package com.uva.api.users.repositories;
 
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.uva.api.models.Manager;
+import com.uva.api.users.models.Manager;
 
 public interface ManagerRepository extends JpaRepository<Manager, Integer> {
   Optional<Manager> findByEmail(String email);
diff --git a/java/services/users/src/main/java/com/uva/api/repositories/UserRepository.java b/java/services/users/src/main/java/com/uva/api/users/repositories/UserRepository.java
similarity index 72%
rename from java/services/users/src/main/java/com/uva/api/repositories/UserRepository.java
rename to java/services/users/src/main/java/com/uva/api/users/repositories/UserRepository.java
index 5a301bc6bed5ecf2352d0dc94f89e2ff69fa062a..94c75261dce191531183675aedbb1eea33ed1a19 100644
--- a/java/services/users/src/main/java/com/uva/api/repositories/UserRepository.java
+++ b/java/services/users/src/main/java/com/uva/api/users/repositories/UserRepository.java
@@ -1,10 +1,10 @@
-package com.uva.api.repositories;
+package com.uva.api.users.repositories;
 
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.uva.api.models.User;
+import com.uva.api.users.models.User;
 
 public interface UserRepository extends JpaRepository<User, Integer> {
   Optional<User> findByEmail(String email);
diff --git a/java/services/users/src/main/java/com/uva/api/services/ClientService.java b/java/services/users/src/main/java/com/uva/api/users/services/ClientService.java
similarity index 86%
rename from java/services/users/src/main/java/com/uva/api/services/ClientService.java
rename to java/services/users/src/main/java/com/uva/api/users/services/ClientService.java
index 81d3f92c2f2cac8108da9263eca42d413118fc9d..6f5a8afb1b077c453f4961899c2c2fb318dbb84b 100644
--- a/java/services/users/src/main/java/com/uva/api/services/ClientService.java
+++ b/java/services/users/src/main/java/com/uva/api/users/services/ClientService.java
@@ -1,4 +1,4 @@
-package com.uva.api.services;
+package com.uva.api.users.services;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -8,14 +8,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import com.uva.api.apis.BookingAPI;
-import com.uva.api.models.Client;
-import com.uva.api.models.User;
-import com.uva.api.models.UserRol;
-import com.uva.api.models.remote.Booking;
-import com.uva.api.models.ClientStatus;
-import com.uva.api.repositories.ClientRepository;
-import com.uva.api.utils.Utils;
+import com.uva.api.users.api.BookingAPI;
+import com.uva.api.users.models.Client;
+import com.uva.api.users.models.ClientStatus;
+import com.uva.api.users.models.User;
+import com.uva.api.users.models.UserRol;
+import com.uva.api.users.models.remote.Booking;
+import com.uva.api.users.repositories.ClientRepository;
+import com.uva.api.users.utils.Utils;
 
 @Service
 public class ClientService {
diff --git a/java/services/users/src/main/java/com/uva/api/services/ManagerService.java b/java/services/users/src/main/java/com/uva/api/users/services/ManagerService.java
similarity index 78%
rename from java/services/users/src/main/java/com/uva/api/services/ManagerService.java
rename to java/services/users/src/main/java/com/uva/api/users/services/ManagerService.java
index 87d8f38c546f2080522205927400a3dcaa42672b..9c9dba2606e17727fe34d1b58ecda7c59c0e0096 100644
--- a/java/services/users/src/main/java/com/uva/api/services/ManagerService.java
+++ b/java/services/users/src/main/java/com/uva/api/users/services/ManagerService.java
@@ -1,4 +1,4 @@
-package com.uva.api.services;
+package com.uva.api.users.services;
 
 import java.util.List;
 
@@ -6,11 +6,11 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.uva.api.apis.HotelApi;
-import com.uva.api.models.Manager;
-import com.uva.api.models.User;
-import com.uva.api.repositories.ManagerRepository;
-import com.uva.api.utils.Utils;
+import com.uva.api.users.api.HotelApi;
+import com.uva.api.users.models.Manager;
+import com.uva.api.users.models.User;
+import com.uva.api.users.repositories.ManagerRepository;
+import com.uva.api.users.utils.Utils;
 
 @Service
 public class ManagerService {
diff --git a/java/services/users/src/main/java/com/uva/api/services/TokenService.java b/java/services/users/src/main/java/com/uva/api/users/services/TokenService.java
similarity index 90%
rename from java/services/users/src/main/java/com/uva/api/services/TokenService.java
rename to java/services/users/src/main/java/com/uva/api/users/services/TokenService.java
index 4d90bbe4e3f3cecfa444d084c98b01c830163844..c543abec77b172775ab23b7b6423771613549a59 100644
--- a/java/services/users/src/main/java/com/uva/api/services/TokenService.java
+++ b/java/services/users/src/main/java/com/uva/api/users/services/TokenService.java
@@ -1,4 +1,4 @@
-package com.uva.api.services;
+package com.uva.api.users.services;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,8 +6,8 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.uva.api.apis.TokenAPI;
-import com.uva.api.models.remote.JwtData;
+import com.uva.api.users.api.TokenAPI;
+import com.uva.api.users.models.remote.JwtData;
 
 @Service
 public class TokenService {
diff --git a/java/services/users/src/main/java/com/uva/api/services/UserService.java b/java/services/users/src/main/java/com/uva/api/users/services/UserService.java
similarity index 91%
rename from java/services/users/src/main/java/com/uva/api/services/UserService.java
rename to java/services/users/src/main/java/com/uva/api/users/services/UserService.java
index 99f21a10bdcbf39d24b18c16f453d8df5f3523a4..bf2d04f4e4abb3718566c960abed6e55d3539c01 100644
--- a/java/services/users/src/main/java/com/uva/api/services/UserService.java
+++ b/java/services/users/src/main/java/com/uva/api/users/services/UserService.java
@@ -1,4 +1,4 @@
-package com.uva.api.services;
+package com.uva.api.users.services;
 
 import java.util.List;
 
@@ -6,11 +6,12 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import com.uva.api.utils.Utils;
-import com.uva.api.models.AuthDTO;
-import com.uva.api.models.User;
-import com.uva.api.models.UserRol;
-import com.uva.api.repositories.UserRepository;
+
+import com.uva.api.users.models.AuthDTO;
+import com.uva.api.users.models.User;
+import com.uva.api.users.models.UserRol;
+import com.uva.api.users.repositories.UserRepository;
+import com.uva.api.users.utils.Utils;
 
 @Service
 public class UserService {
diff --git a/java/services/users/src/main/java/com/uva/api/utils/Utils.java b/java/services/users/src/main/java/com/uva/api/users/utils/Utils.java
similarity index 55%
rename from java/services/users/src/main/java/com/uva/api/utils/Utils.java
rename to java/services/users/src/main/java/com/uva/api/users/utils/Utils.java
index 0f3a0cf5975790d1b88f482d5d3d51d79d90792a..219bfe4c3e4921c81ca2e1a26d02e65dc067d6ab 100644
--- a/java/services/users/src/main/java/com/uva/api/utils/Utils.java
+++ b/java/services/users/src/main/java/com/uva/api/users/utils/Utils.java
@@ -1,15 +1,13 @@
-package com.uva.api.utils;
+package com.uva.api.users.utils;
 
 import java.util.Optional;
 
-import org.springframework.http.HttpStatus;
-import org.springframework.web.client.HttpClientErrorException;
-
-import com.uva.api.models.User;
+import com.uva.api.users.exceptions.UserNotFoundException;
+import com.uva.api.users.models.User;
 
 public class Utils {
   public static <T extends User> T assertUser(Optional<T> opUser) {
-    return opUser.orElseThrow(() -> new HttpClientErrorException(HttpStatus.NOT_FOUND));
+    return opUser.orElseThrow(() -> new UserNotFoundException());
   }
 
   public static boolean notEmptyStrings(String... values) {