diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/HotelsApplication.java b/java/services/hotels/src/main/java/com/uva/api/HotelsApplication.java
similarity index 91%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/HotelsApplication.java
rename to java/services/hotels/src/main/java/com/uva/api/HotelsApplication.java
index b458b0bf085d44574b803b30a1fedcc7f80f4daa..0d15b4f97491b1ffc6d6c2dac7ee4159825e5d06 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/HotelsApplication.java
+++ b/java/services/hotels/src/main/java/com/uva/api/HotelsApplication.java
@@ -1,4 +1,4 @@
-package com.uva.monolith;
+package com.uva.api;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/api/BookingAPI.java b/java/services/hotels/src/main/java/com/uva/api/apis/BookingAPI.java
similarity index 98%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/api/BookingAPI.java
rename to java/services/hotels/src/main/java/com/uva/api/apis/BookingAPI.java
index 369066bd537e131c333b04ae0415f7527cff6885..53dc6558cff6154445c34980ed2896da73d163dc 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/api/BookingAPI.java
+++ b/java/services/hotels/src/main/java/com/uva/api/apis/BookingAPI.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.api;
+package com.uva.api.apis;
 
 import java.time.LocalDate;
 import java.util.HashSet;
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/api/ManagerAPI.java b/java/services/hotels/src/main/java/com/uva/api/apis/ManagerAPI.java
similarity index 96%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/api/ManagerAPI.java
rename to java/services/hotels/src/main/java/com/uva/api/apis/ManagerAPI.java
index fda96949c48eb0cd159fd181efe6c845eff08767..a7eb79b6dd8a9b9b31bfe383363b2a8fa44d4a0d 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/api/ManagerAPI.java
+++ b/java/services/hotels/src/main/java/com/uva/api/apis/ManagerAPI.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.api;
+package com.uva.api.apis;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/config/RestTemplateConfig.java b/java/services/hotels/src/main/java/com/uva/api/config/RestTemplateConfig.java
similarity index 90%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/config/RestTemplateConfig.java
rename to java/services/hotels/src/main/java/com/uva/api/config/RestTemplateConfig.java
index 43da2b78e915df7993cd4e123f57be22475b965f..5d215af870f9cfe8a1ab8386b6294b7e062bd56a 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/config/RestTemplateConfig.java
+++ b/java/services/hotels/src/main/java/com/uva/api/config/RestTemplateConfig.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.config;
+package com.uva.api.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/config/SecurityConfig.java b/java/services/hotels/src/main/java/com/uva/api/config/SecurityConfig.java
similarity index 93%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/config/SecurityConfig.java
rename to java/services/hotels/src/main/java/com/uva/api/config/SecurityConfig.java
index ccb40af588554c5aa42390c5adc9cc38ecf0332f..41524e4e660c5f453fa916a62fb2bbe089d48277 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/config/SecurityConfig.java
+++ b/java/services/hotels/src/main/java/com/uva/api/config/SecurityConfig.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.config;
+package com.uva.api.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.monolith.filter.JwtAuthenticationFilter;
-import com.uva.monolith.models.external.users.UserRol;
+import com.uva.api.filter.JwtAuthenticationFilter;
+import com.uva.api.models.external.users.UserRol;
 
 @Configuration
 @EnableWebSecurity
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/controllers/HotelController.java b/java/services/hotels/src/main/java/com/uva/api/controllers/HotelController.java
similarity index 84%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/controllers/HotelController.java
rename to java/services/hotels/src/main/java/com/uva/api/controllers/HotelController.java
index 643c08f272b6f1638ff2ecef077dc872e39438be..ac95b7805793dd267c1e9aa04765e9b899301d90 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/controllers/HotelController.java
+++ b/java/services/hotels/src/main/java/com/uva/api/controllers/HotelController.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.controllers;
+package com.uva.api.controllers;
 
 import java.util.List;
 import java.util.Map;
@@ -11,16 +11,16 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import com.uva.monolith.api.BookingAPI;
-import com.uva.monolith.api.ManagerAPI;
-import com.uva.monolith.exceptions.HotelNotFoundException;
-import com.uva.monolith.exceptions.InvalidDateRangeException;
-import com.uva.monolith.exceptions.InvalidRequestException;
-import com.uva.monolith.models.Hotel;
-import com.uva.monolith.models.Room;
-import com.uva.monolith.repositories.HotelRepository;
-import com.uva.monolith.repositories.RoomRepository;
-import com.uva.monolith.services.HotelService;
+import com.uva.api.apis.BookingAPI;
+import com.uva.api.apis.ManagerAPI;
+import com.uva.api.exceptions.HotelNotFoundException;
+import com.uva.api.exceptions.InvalidDateRangeException;
+import com.uva.api.exceptions.InvalidRequestException;
+import com.uva.api.models.Hotel;
+import com.uva.api.models.Room;
+import com.uva.api.repositories.HotelRepository;
+import com.uva.api.repositories.RoomRepository;
+import com.uva.api.services.HotelService;
 
 @RestController
 @RequestMapping("hotels")
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/exceptions/GlobalExceptionHandler.java b/java/services/hotels/src/main/java/com/uva/api/exceptions/GlobalExceptionHandler.java
similarity index 98%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/exceptions/GlobalExceptionHandler.java
rename to java/services/hotels/src/main/java/com/uva/api/exceptions/GlobalExceptionHandler.java
index 9428c51a9c63c3623d44752c9e3cbe6cf78ac19f..5681a607c7b0885255a2259e809cb4bb29bf456d 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/exceptions/GlobalExceptionHandler.java
+++ b/java/services/hotels/src/main/java/com/uva/api/exceptions/GlobalExceptionHandler.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.exceptions;
+package com.uva.api.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/exceptions/HotelNotFoundException.java b/java/services/hotels/src/main/java/com/uva/api/exceptions/HotelNotFoundException.java
similarity index 90%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/exceptions/HotelNotFoundException.java
rename to java/services/hotels/src/main/java/com/uva/api/exceptions/HotelNotFoundException.java
index 129a0b1086b4b78eb1f1725b9f241f51ce5540f8..dc466f6f5f91da47dbe73c34b97059c817937f13 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/exceptions/HotelNotFoundException.java
+++ b/java/services/hotels/src/main/java/com/uva/api/exceptions/HotelNotFoundException.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.exceptions;
+package com.uva.api.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/exceptions/InvalidDateRangeException.java b/java/services/hotels/src/main/java/com/uva/api/exceptions/InvalidDateRangeException.java
similarity index 80%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/exceptions/InvalidDateRangeException.java
rename to java/services/hotels/src/main/java/com/uva/api/exceptions/InvalidDateRangeException.java
index 5fea986ef1e9279c459bc5aff10932049f283333..58bf97d7b6dceb1db771de7058da6f159480a5b9 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/exceptions/InvalidDateRangeException.java
+++ b/java/services/hotels/src/main/java/com/uva/api/exceptions/InvalidDateRangeException.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.exceptions;
+package com.uva.api.exceptions;
 
 public class InvalidDateRangeException extends RuntimeException {
     public InvalidDateRangeException(String message) {
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/exceptions/InvalidRequestException.java b/java/services/hotels/src/main/java/com/uva/api/exceptions/InvalidRequestException.java
similarity index 88%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/exceptions/InvalidRequestException.java
rename to java/services/hotels/src/main/java/com/uva/api/exceptions/InvalidRequestException.java
index ca09e054420dd174c4d2c3424dcc8fe74b6c8576..677cc4b7cb71bb20c3a9644ff2a8d3552546ea2c 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/exceptions/InvalidRequestException.java
+++ b/java/services/hotels/src/main/java/com/uva/api/exceptions/InvalidRequestException.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.exceptions;
+package com.uva.api.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/filter/JwtAuthenticationFilter.java b/java/services/hotels/src/main/java/com/uva/api/filter/JwtAuthenticationFilter.java
similarity index 97%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/filter/JwtAuthenticationFilter.java
rename to java/services/hotels/src/main/java/com/uva/api/filter/JwtAuthenticationFilter.java
index 9718640bee0fd410244cd2a5d8b6c54cf80bf9d2..58d6e766705907c520543b4ff0349c54b4d4952e 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/filter/JwtAuthenticationFilter.java
+++ b/java/services/hotels/src/main/java/com/uva/api/filter/JwtAuthenticationFilter.java
@@ -1,10 +1,10 @@
-package com.uva.monolith.filter;
+package com.uva.api.filter;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.DecodedJWT;
-import com.uva.monolith.models.external.users.UserRol;
+import com.uva.api.models.external.users.UserRol;
 import com.auth0.jwt.exceptions.JWTVerificationException;
 
 import org.springframework.beans.factory.annotation.Value;
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/interceptor/AuthHttpInterceptor.java b/java/services/hotels/src/main/java/com/uva/api/interceptor/AuthHttpInterceptor.java
similarity index 90%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/interceptor/AuthHttpInterceptor.java
rename to java/services/hotels/src/main/java/com/uva/api/interceptor/AuthHttpInterceptor.java
index e6048081856b1c51c14371daf6c3d8349405336b..490cab9660489a4880f4aa6b1146a73e960a309e 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/interceptor/AuthHttpInterceptor.java
+++ b/java/services/hotels/src/main/java/com/uva/api/interceptor/AuthHttpInterceptor.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.interceptor;
+package com.uva.api.interceptor;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpRequest;
@@ -7,8 +7,8 @@ import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.stereotype.Component;
 
-import com.uva.monolith.models.external.users.UserRol;
-import com.uva.monolith.utils.JwtUtil;
+import com.uva.api.models.external.users.UserRol;
+import com.uva.api.utils.JwtUtil;
 
 import java.io.IOException;
 
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/models/Address.java b/java/services/hotels/src/main/java/com/uva/api/models/Address.java
similarity index 98%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/models/Address.java
rename to java/services/hotels/src/main/java/com/uva/api/models/Address.java
index b7c67a35813f734056706b33102745a2807cc68e..d654ce69441fdbaf46f7b03de059eacc7d9f61d2 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/models/Address.java
+++ b/java/services/hotels/src/main/java/com/uva/api/models/Address.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.models;
+package com.uva.api.models;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/models/Hotel.java b/java/services/hotels/src/main/java/com/uva/api/models/Hotel.java
similarity index 97%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/models/Hotel.java
rename to java/services/hotels/src/main/java/com/uva/api/models/Hotel.java
index 69761fe8aef68f2b8e50f7798b2ac924f8b33f6d..15bce18ef4f20920966ad3fce6e1275d7fa71a91 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/models/Hotel.java
+++ b/java/services/hotels/src/main/java/com/uva/api/models/Hotel.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.models;
+package com.uva.api.models;
 
 import java.util.List;
 
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/models/Room.java b/java/services/hotels/src/main/java/com/uva/api/models/Room.java
similarity index 97%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/models/Room.java
rename to java/services/hotels/src/main/java/com/uva/api/models/Room.java
index db6bd173b554fa468b04f056dbbeda60c12e9b9d..c3a309970fc7a744a8af161bfca84bd7e352b934 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/models/Room.java
+++ b/java/services/hotels/src/main/java/com/uva/api/models/Room.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.models;
+package com.uva.api.models;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/models/RoomType.java b/java/services/hotels/src/main/java/com/uva/api/models/RoomType.java
similarity index 64%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/models/RoomType.java
rename to java/services/hotels/src/main/java/com/uva/api/models/RoomType.java
index 0e1007db8471dba884440167ef99a8110a25a848..4e988ccbc504b4ec7b0ccb05796b880ff7adacd0 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/models/RoomType.java
+++ b/java/services/hotels/src/main/java/com/uva/api/models/RoomType.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.models;
+package com.uva.api.models;
 
 public enum RoomType {
     SINGLE,
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/models/external/users/UserRol.java b/java/services/hotels/src/main/java/com/uva/api/models/external/users/UserRol.java
similarity index 53%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/models/external/users/UserRol.java
rename to java/services/hotels/src/main/java/com/uva/api/models/external/users/UserRol.java
index b541a76ab002cf14123737e02058f77401b03d12..ab6efcc9875165bc751045a64b82bb69d326eaea 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/models/external/users/UserRol.java
+++ b/java/services/hotels/src/main/java/com/uva/api/models/external/users/UserRol.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.models.external.users;
+package com.uva.api.models.external.users;
 
 public enum UserRol {
     ADMIN, CLIENT, HOTEL_ADMIN
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/repositories/HotelRepository.java b/java/services/hotels/src/main/java/com/uva/api/repositories/HotelRepository.java
similarity index 73%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/repositories/HotelRepository.java
rename to java/services/hotels/src/main/java/com/uva/api/repositories/HotelRepository.java
index 6b748f1affc0ebdbcbb2c00aa465490579824479..f216ba6b2184991d4a851d4b1fdc103dedc3a1aa 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/repositories/HotelRepository.java
+++ b/java/services/hotels/src/main/java/com/uva/api/repositories/HotelRepository.java
@@ -1,9 +1,10 @@
-package com.uva.monolith.repositories;
+package com.uva.api.repositories;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import com.uva.monolith.models.Hotel;
+
+import com.uva.api.models.Hotel;
 
 public interface HotelRepository extends JpaRepository<Hotel, Integer> {
     List<Hotel> findAllByManagerId(Integer managerId);
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/repositories/RoomRepository.java b/java/services/hotels/src/main/java/com/uva/api/repositories/RoomRepository.java
similarity index 85%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/repositories/RoomRepository.java
rename to java/services/hotels/src/main/java/com/uva/api/repositories/RoomRepository.java
index 532e02ef25feae0d7f2bead32e7b92462984395a..e62066e38a440e120069ecffce6da8b30b176cd8 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/repositories/RoomRepository.java
+++ b/java/services/hotels/src/main/java/com/uva/api/repositories/RoomRepository.java
@@ -1,9 +1,9 @@
-package com.uva.monolith.repositories;
+package com.uva.api.repositories;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
-import com.uva.monolith.models.Room;
+import com.uva.api.models.Room;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/services/HotelService.java b/java/services/hotels/src/main/java/com/uva/api/services/HotelService.java
similarity index 88%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/services/HotelService.java
rename to java/services/hotels/src/main/java/com/uva/api/services/HotelService.java
index c763f9d82ca2c732429038a946565fd5e4b51ede..e5893bf639ba722527497056c591710f9bbb14ca 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/services/HotelService.java
+++ b/java/services/hotels/src/main/java/com/uva/api/services/HotelService.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.services;
+package com.uva.api.services;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -8,15 +8,15 @@ import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.uva.monolith.api.BookingAPI;
-import com.uva.monolith.api.ManagerAPI;
-import com.uva.monolith.exceptions.HotelNotFoundException;
-import com.uva.monolith.exceptions.InvalidDateRangeException;
-import com.uva.monolith.exceptions.InvalidRequestException;
-import com.uva.monolith.models.Hotel;
-import com.uva.monolith.models.Room;
-import com.uva.monolith.repositories.HotelRepository;
-import com.uva.monolith.repositories.RoomRepository;
+import com.uva.api.apis.BookingAPI;
+import com.uva.api.apis.ManagerAPI;
+import com.uva.api.exceptions.HotelNotFoundException;
+import com.uva.api.exceptions.InvalidDateRangeException;
+import com.uva.api.exceptions.InvalidRequestException;
+import com.uva.api.models.Hotel;
+import com.uva.api.models.Room;
+import com.uva.api.repositories.HotelRepository;
+import com.uva.api.repositories.RoomRepository;
 
 @Service
 public class HotelService {
diff --git a/java/services/hotels/src/main/java/com/uva/apis/hotels/utils/JwtUtil.java b/java/services/hotels/src/main/java/com/uva/api/utils/JwtUtil.java
similarity index 92%
rename from java/services/hotels/src/main/java/com/uva/apis/hotels/utils/JwtUtil.java
rename to java/services/hotels/src/main/java/com/uva/api/utils/JwtUtil.java
index a7bd5f863d5a12b5fd6ed0b3419fdc4acaec0de6..73580a488465230d1ff7e57ac0c4e3b0dad587c6 100644
--- a/java/services/hotels/src/main/java/com/uva/apis/hotels/utils/JwtUtil.java
+++ b/java/services/hotels/src/main/java/com/uva/api/utils/JwtUtil.java
@@ -1,4 +1,4 @@
-package com.uva.monolith.utils;
+package com.uva.api.utils;
 
 import java.util.Date;
 
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
-import com.uva.monolith.models.external.users.UserRol;
+import com.uva.api.models.external.users.UserRol;
 
 @Component
 public class JwtUtil {