diff --git a/SpringApp/library/src/main/java/com/ip/library/LibraryApplication.java b/SpringApp/library/src/main/java/com/ip/library/LibraryApplication.java
index ab43fc5..265487b 100644
--- a/SpringApp/library/src/main/java/com/ip/library/LibraryApplication.java
+++ b/SpringApp/library/src/main/java/com/ip/library/LibraryApplication.java
@@ -12,14 +12,14 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import com.ip.library.authors.model.AuthorEntity;
-import com.ip.library.authors.service.AuthorService;
-import com.ip.library.books.model.BookEntity;
-import com.ip.library.books.service.BookService;
-import com.ip.library.types.model.TypeEntity;
-import com.ip.library.types.service.TypeService;
-import com.ip.library.users.model.UserEntity;
-import com.ip.library.users.service.UserService;
+import com.ip.library.controllers.authors.AuthorEntity;
+import com.ip.library.controllers.authors.AuthorService;
+import com.ip.library.controllers.books.BookEntity;
+import com.ip.library.controllers.books.BookService;
+import com.ip.library.controllers.types.TypeEntity;
+import com.ip.library.controllers.types.TypeService;
+import com.ip.library.controllers.users.UserEntity;
+import com.ip.library.controllers.users.UserService;
 
 
 @SuppressWarnings("unused")
diff --git a/SpringApp/library/src/main/java/com/ip/library/authors/api/AuthorController.java b/SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorController.java
similarity index 91%
rename from SpringApp/library/src/main/java/com/ip/library/authors/api/AuthorController.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorController.java
index 431ff51..7cbf060 100644
--- a/SpringApp/library/src/main/java/com/ip/library/authors/api/AuthorController.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorController.java
@@ -1,4 +1,4 @@
-package com.ip.library.authors.api;
+package com.ip.library.controllers.authors;
 
 import java.util.List;
 
@@ -13,10 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.ip.library.controllers.users.UserRole;
 import com.ip.library.core.configuration.Constants;
-import com.ip.library.users.model.UserRole;
-import com.ip.library.authors.model.AuthorEntity;
-import com.ip.library.authors.service.AuthorService;
 
 import jakarta.validation.Valid;
 
diff --git a/SpringApp/library/src/main/java/com/ip/library/authors/api/AuthorDto.java b/SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorDto.java
similarity index 92%
rename from SpringApp/library/src/main/java/com/ip/library/authors/api/AuthorDto.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorDto.java
index 59fb8c3..2c12f2d 100644
--- a/SpringApp/library/src/main/java/com/ip/library/authors/api/AuthorDto.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorDto.java
@@ -1,4 +1,4 @@
-package com.ip.library.authors.api;
+package com.ip.library.controllers.authors;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/SpringApp/library/src/main/java/com/ip/library/authors/model/AuthorEntity.java b/SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorEntity.java
similarity index 92%
rename from SpringApp/library/src/main/java/com/ip/library/authors/model/AuthorEntity.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorEntity.java
index 1add767..629efec 100644
--- a/SpringApp/library/src/main/java/com/ip/library/authors/model/AuthorEntity.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorEntity.java
@@ -1,11 +1,11 @@
-package com.ip.library.authors.model;
+package com.ip.library.controllers.authors;
 
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
-import com.ip.library.authors_books.model.AuthorsBooksEntity;
-import com.ip.library.books.model.BookEntity;
+import com.ip.library.controllers.authors_books.AuthorsBooksEntity;
+import com.ip.library.controllers.books.BookEntity;
 import com.ip.library.core.model.BaseEntity;
 
 import jakarta.persistence.CascadeType;
diff --git a/SpringApp/library/src/main/java/com/ip/library/authors/repository/AuthorRepository.java b/SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorRepository.java
similarity index 78%
rename from SpringApp/library/src/main/java/com/ip/library/authors/repository/AuthorRepository.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorRepository.java
index 13c44dd..15fa3cc 100644
--- a/SpringApp/library/src/main/java/com/ip/library/authors/repository/AuthorRepository.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorRepository.java
@@ -1,12 +1,10 @@
-package com.ip.library.authors.repository;
+package com.ip.library.controllers.authors;
 
 import java.util.Optional;
 
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import com.ip.library.authors.model.AuthorEntity;
-
 public interface AuthorRepository extends 
 		CrudRepository<AuthorEntity, Long>,
 		PagingAndSortingRepository<AuthorEntity, Long> {
diff --git a/SpringApp/library/src/main/java/com/ip/library/authors/service/AuthorService.java b/SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorService.java
similarity index 92%
rename from SpringApp/library/src/main/java/com/ip/library/authors/service/AuthorService.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorService.java
index 27eee8f..61b906a 100644
--- a/SpringApp/library/src/main/java/com/ip/library/authors/service/AuthorService.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorService.java
@@ -1,4 +1,4 @@
-package com.ip.library.authors.service;
+package com.ip.library.controllers.authors;
 
 import java.util.List;
 import java.util.stream.StreamSupport;
@@ -7,8 +7,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.ip.library.core.error.NotFoundException;
-import com.ip.library.authors.model.AuthorEntity;
-import com.ip.library.authors.repository.AuthorRepository;
 
 @Service
 public class AuthorService {
diff --git a/SpringApp/library/src/main/java/com/ip/library/authors_books/model/AuthorsBooksEntity.java b/SpringApp/library/src/main/java/com/ip/library/controllers/authors_books/AuthorsBooksEntity.java
similarity index 91%
rename from SpringApp/library/src/main/java/com/ip/library/authors_books/model/AuthorsBooksEntity.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/authors_books/AuthorsBooksEntity.java
index b5fbd3e..e9662ca 100644
--- a/SpringApp/library/src/main/java/com/ip/library/authors_books/model/AuthorsBooksEntity.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/authors_books/AuthorsBooksEntity.java
@@ -1,9 +1,9 @@
-package com.ip.library.authors_books.model;
+package com.ip.library.controllers.authors_books;
 
 import java.util.Objects;
 
-import com.ip.library.authors.model.AuthorEntity;
-import com.ip.library.books.model.BookEntity;
+import com.ip.library.controllers.authors.AuthorEntity;
+import com.ip.library.controllers.books.BookEntity;
 
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
diff --git a/SpringApp/library/src/main/java/com/ip/library/authors_books/model/AuthorsBooksId.java b/SpringApp/library/src/main/java/com/ip/library/controllers/authors_books/AuthorsBooksId.java
similarity index 95%
rename from SpringApp/library/src/main/java/com/ip/library/authors_books/model/AuthorsBooksId.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/authors_books/AuthorsBooksId.java
index 4329897..dd934da 100644
--- a/SpringApp/library/src/main/java/com/ip/library/authors_books/model/AuthorsBooksId.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/authors_books/AuthorsBooksId.java
@@ -1,4 +1,4 @@
-package com.ip.library.authors_books.model;
+package com.ip.library.controllers.authors_books;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/SpringApp/library/src/main/java/com/ip/library/books/api/BookController.java b/SpringApp/library/src/main/java/com/ip/library/controllers/books/BookController.java
similarity index 93%
rename from SpringApp/library/src/main/java/com/ip/library/books/api/BookController.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/books/BookController.java
index 93ea780..2ec3bab 100644
--- a/SpringApp/library/src/main/java/com/ip/library/books/api/BookController.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/books/BookController.java
@@ -1,4 +1,4 @@
-package com.ip.library.books.api;
+package com.ip.library.controllers.books;
 
 import java.util.List;
 
@@ -14,11 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ip.library.books.model.BookEntity;
-import com.ip.library.books.service.BookService;
+import com.ip.library.controllers.types.TypeService;
+import com.ip.library.controllers.users.UserRole;
 import com.ip.library.core.configuration.Constants;
-import com.ip.library.types.service.TypeService;
-import com.ip.library.users.model.UserRole;
 
 import jakarta.validation.Valid;
 
diff --git a/SpringApp/library/src/main/java/com/ip/library/books/api/BookDto.java b/SpringApp/library/src/main/java/com/ip/library/controllers/books/BookDto.java
similarity index 96%
rename from SpringApp/library/src/main/java/com/ip/library/books/api/BookDto.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/books/BookDto.java
index 41346ef..5733df3 100644
--- a/SpringApp/library/src/main/java/com/ip/library/books/api/BookDto.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/books/BookDto.java
@@ -1,4 +1,4 @@
-package com.ip.library.books.api;
+package com.ip.library.controllers.books;
 
 import java.util.List;
 
diff --git a/SpringApp/library/src/main/java/com/ip/library/books/model/BookEntity.java b/SpringApp/library/src/main/java/com/ip/library/controllers/books/BookEntity.java
similarity index 91%
rename from SpringApp/library/src/main/java/com/ip/library/books/model/BookEntity.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/books/BookEntity.java
index 296afd5..1b3b853 100644
--- a/SpringApp/library/src/main/java/com/ip/library/books/model/BookEntity.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/books/BookEntity.java
@@ -1,11 +1,10 @@
-package com.ip.library.books.model;
+package com.ip.library.controllers.books;
 
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
 import com.ip.library.core.model.BaseEntity;
-import com.ip.library.types.model.TypeEntity;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
@@ -17,8 +16,9 @@ import jakarta.persistence.OneToMany;
 import jakarta.persistence.OrderBy;
 import jakarta.persistence.Table;
 
-import com.ip.library.authors.model.AuthorEntity;
-import com.ip.library.authors_books.model.AuthorsBooksEntity;
+import com.ip.library.controllers.authors.AuthorEntity;
+import com.ip.library.controllers.authors_books.AuthorsBooksEntity;
+import com.ip.library.controllers.types.TypeEntity;
 
 @Entity
 @Table(name = "books")
diff --git a/SpringApp/library/src/main/java/com/ip/library/books/repository/BookRepository.java b/SpringApp/library/src/main/java/com/ip/library/controllers/books/BookRepository.java
similarity index 94%
rename from SpringApp/library/src/main/java/com/ip/library/books/repository/BookRepository.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/books/BookRepository.java
index 2a49435..1d322f5 100644
--- a/SpringApp/library/src/main/java/com/ip/library/books/repository/BookRepository.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/books/BookRepository.java
@@ -1,4 +1,4 @@
-package com.ip.library.books.repository;
+package com.ip.library.controllers.books;
 
 import java.util.List;
 import java.util.Optional;
@@ -9,8 +9,6 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import com.ip.library.books.model.BookEntity;
-
 public interface BookRepository extends 
 		CrudRepository<BookEntity, Long>, 
 		PagingAndSortingRepository<BookEntity, Long> {
diff --git a/SpringApp/library/src/main/java/com/ip/library/books/service/BookService.java b/SpringApp/library/src/main/java/com/ip/library/controllers/books/BookService.java
similarity index 93%
rename from SpringApp/library/src/main/java/com/ip/library/books/service/BookService.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/books/BookService.java
index e893c19..297b298 100644
--- a/SpringApp/library/src/main/java/com/ip/library/books/service/BookService.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/books/BookService.java
@@ -1,4 +1,4 @@
-package com.ip.library.books.service;
+package com.ip.library.controllers.books;
 
 import java.util.List;
 import java.util.stream.StreamSupport;
@@ -8,10 +8,8 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ip.library.authors.model.AuthorEntity;
-import com.ip.library.authors.service.AuthorService;
-import com.ip.library.books.model.BookEntity;
-import com.ip.library.books.repository.BookRepository;
+import com.ip.library.controllers.authors.AuthorEntity;
+import com.ip.library.controllers.authors.AuthorService;
 import com.ip.library.core.error.NotFoundException;
 
 @Service
diff --git a/SpringApp/library/src/main/java/com/ip/library/favorites/model/FavoriteEntity.java b/SpringApp/library/src/main/java/com/ip/library/controllers/favorites/FavoriteEntity.java
similarity index 91%
rename from SpringApp/library/src/main/java/com/ip/library/favorites/model/FavoriteEntity.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/favorites/FavoriteEntity.java
index e3acc71..7e93135 100644
--- a/SpringApp/library/src/main/java/com/ip/library/favorites/model/FavoriteEntity.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/favorites/FavoriteEntity.java
@@ -1,9 +1,9 @@
-package com.ip.library.favorites.model;
+package com.ip.library.controllers.favorites;
 
 import java.util.Objects;
 
-import com.ip.library.books.model.BookEntity;
-import com.ip.library.users.model.UserEntity;
+import com.ip.library.controllers.books.BookEntity;
+import com.ip.library.controllers.users.UserEntity;
 
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
diff --git a/SpringApp/library/src/main/java/com/ip/library/favorites/model/UserBookId.java b/SpringApp/library/src/main/java/com/ip/library/controllers/favorites/UserBookId.java
similarity index 95%
rename from SpringApp/library/src/main/java/com/ip/library/favorites/model/UserBookId.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/favorites/UserBookId.java
index 0a39979..5383626 100644
--- a/SpringApp/library/src/main/java/com/ip/library/favorites/model/UserBookId.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/favorites/UserBookId.java
@@ -1,4 +1,4 @@
-package com.ip.library.favorites.model;
+package com.ip.library.controllers.favorites;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/SpringApp/library/src/main/java/com/ip/library/types/api/TypeController.java b/SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeController.java
similarity index 92%
rename from SpringApp/library/src/main/java/com/ip/library/types/api/TypeController.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeController.java
index f6e6125..4a85ba8 100644
--- a/SpringApp/library/src/main/java/com/ip/library/types/api/TypeController.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeController.java
@@ -1,4 +1,4 @@
-package com.ip.library.types.api;
+package com.ip.library.controllers.types;
 
 import java.util.List;
 
@@ -13,10 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.ip.library.controllers.users.UserRole;
 import com.ip.library.core.configuration.Constants;
-import com.ip.library.types.model.TypeEntity;
-import com.ip.library.types.service.TypeService;
-import com.ip.library.users.model.UserRole;
 
 import jakarta.validation.Valid;
 
diff --git a/SpringApp/library/src/main/java/com/ip/library/types/api/TypeDto.java b/SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeDto.java
similarity index 93%
rename from SpringApp/library/src/main/java/com/ip/library/types/api/TypeDto.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeDto.java
index 49583bf..d96516c 100644
--- a/SpringApp/library/src/main/java/com/ip/library/types/api/TypeDto.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeDto.java
@@ -1,4 +1,4 @@
-package com.ip.library.types.api;
+package com.ip.library.controllers.types;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/SpringApp/library/src/main/java/com/ip/library/types/model/TypeEntity.java b/SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeEntity.java
similarity index 96%
rename from SpringApp/library/src/main/java/com/ip/library/types/model/TypeEntity.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeEntity.java
index 61d97e6..945030b 100644
--- a/SpringApp/library/src/main/java/com/ip/library/types/model/TypeEntity.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeEntity.java
@@ -1,4 +1,4 @@
-package com.ip.library.types.model;
+package com.ip.library.controllers.types;
 
 import java.util.Objects;
 
diff --git a/SpringApp/library/src/main/java/com/ip/library/types/repository/TypeRepository.java b/SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeRepository.java
similarity index 71%
rename from SpringApp/library/src/main/java/com/ip/library/types/repository/TypeRepository.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeRepository.java
index 1bf1394..fb29157 100644
--- a/SpringApp/library/src/main/java/com/ip/library/types/repository/TypeRepository.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeRepository.java
@@ -1,11 +1,9 @@
-package com.ip.library.types.repository;
+package com.ip.library.controllers.types;
 
 import java.util.Optional;
 
 import org.springframework.data.repository.CrudRepository;
 
-import com.ip.library.types.model.TypeEntity;
-
 public interface TypeRepository extends CrudRepository<TypeEntity, Long> {
     Optional<TypeEntity> findByNameIgnoreCase(String name);
 }
diff --git a/SpringApp/library/src/main/java/com/ip/library/types/service/TypeService.java b/SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeService.java
similarity index 93%
rename from SpringApp/library/src/main/java/com/ip/library/types/service/TypeService.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeService.java
index 82eff00..68968b4 100644
--- a/SpringApp/library/src/main/java/com/ip/library/types/service/TypeService.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeService.java
@@ -1,4 +1,4 @@
-package com.ip.library.types.service;
+package com.ip.library.controllers.types;
 
 import java.util.List;
 import java.util.stream.StreamSupport;
@@ -7,8 +7,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.ip.library.core.error.NotFoundException;
-import com.ip.library.types.model.TypeEntity;
-import com.ip.library.types.repository.TypeRepository;
 
 @Service
 public class TypeService {
diff --git a/SpringApp/library/src/main/java/com/ip/library/users/api/LoginController.java b/SpringApp/library/src/main/java/com/ip/library/controllers/users/LoginController.java
similarity index 92%
rename from SpringApp/library/src/main/java/com/ip/library/users/api/LoginController.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/users/LoginController.java
index 4a4c51a..5d0acb8 100644
--- a/SpringApp/library/src/main/java/com/ip/library/users/api/LoginController.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/users/LoginController.java
@@ -1,4 +1,4 @@
-package com.ip.library.users.api;
+package com.ip.library.controllers.users;
 
 import java.util.Objects;
 
@@ -8,8 +8,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ip.library.core.configuration.Constants;
-import com.ip.library.users.model.UserEntity;
-import com.ip.library.users.service.UserService;
 
 @RestController
 public class LoginController {
diff --git a/SpringApp/library/src/main/java/com/ip/library/users/api/UserBookController.java b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserBookController.java
similarity index 89%
rename from SpringApp/library/src/main/java/com/ip/library/users/api/UserBookController.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/users/UserBookController.java
index 74567c4..c68135f 100644
--- a/SpringApp/library/src/main/java/com/ip/library/users/api/UserBookController.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserBookController.java
@@ -1,4 +1,4 @@
-package com.ip.library.users.api;
+package com.ip.library.controllers.users;
 
 import java.util.List;
 
@@ -10,11 +10,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ip.library.books.api.BookDto;
-import com.ip.library.books.model.BookEntity;
+import com.ip.library.controllers.books.BookDto;
+import com.ip.library.controllers.books.BookEntity;
 import com.ip.library.core.configuration.Constants;
-import com.ip.library.users.model.UserRole;
-import com.ip.library.users.service.UserService;
 
 @RestController
 @Secured(value = { UserRole.Secured.USER, UserRole.Secured.ADMIN })
diff --git a/SpringApp/library/src/main/java/com/ip/library/users/api/UserController.java b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserController.java
similarity index 93%
rename from SpringApp/library/src/main/java/com/ip/library/users/api/UserController.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/users/UserController.java
index e845453..e8a0b1f 100644
--- a/SpringApp/library/src/main/java/com/ip/library/users/api/UserController.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserController.java
@@ -1,4 +1,4 @@
-package com.ip.library.users.api;
+package com.ip.library.controllers.users;
 
 import org.modelmapper.ModelMapper;
 import org.springframework.security.access.annotation.Secured;
@@ -15,9 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ip.library.core.api.PageDto;
 import com.ip.library.core.api.PageDtoMapper;
 import com.ip.library.core.configuration.Constants;
-import com.ip.library.users.model.UserEntity;
-import com.ip.library.users.model.UserRole;
-import com.ip.library.users.service.UserService;
 
 import jakarta.validation.Valid;
 
diff --git a/SpringApp/library/src/main/java/com/ip/library/users/api/UserDto.java b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserDto.java
similarity index 93%
rename from SpringApp/library/src/main/java/com/ip/library/users/api/UserDto.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/users/UserDto.java
index 67297aa..ea033d3 100644
--- a/SpringApp/library/src/main/java/com/ip/library/users/api/UserDto.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserDto.java
@@ -1,4 +1,4 @@
-package com.ip.library.users.api;
+package com.ip.library.controllers.users;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/SpringApp/library/src/main/java/com/ip/library/users/model/UserEntity.java b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserEntity.java
similarity index 94%
rename from SpringApp/library/src/main/java/com/ip/library/users/model/UserEntity.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/users/UserEntity.java
index 9d634eb..20195ff 100644
--- a/SpringApp/library/src/main/java/com/ip/library/users/model/UserEntity.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserEntity.java
@@ -1,12 +1,12 @@
-package com.ip.library.users.model;
+package com.ip.library.controllers.users;
 
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
-import com.ip.library.books.model.BookEntity;
+import com.ip.library.controllers.books.BookEntity;
+import com.ip.library.controllers.favorites.FavoriteEntity;
 import com.ip.library.core.model.BaseEntity;
-import com.ip.library.favorites.model.FavoriteEntity;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
diff --git a/SpringApp/library/src/main/java/com/ip/library/users/repository/UserRepository.java b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserRepository.java
similarity index 86%
rename from SpringApp/library/src/main/java/com/ip/library/users/repository/UserRepository.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/users/UserRepository.java
index 8c78de8..a1be84d 100644
--- a/SpringApp/library/src/main/java/com/ip/library/users/repository/UserRepository.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserRepository.java
@@ -1,4 +1,4 @@
-package com.ip.library.users.repository;
+package com.ip.library.controllers.users;
 
 import java.util.List;
 import java.util.Optional;
@@ -9,8 +9,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import com.ip.library.books.model.BookEntity;
-import com.ip.library.users.model.UserEntity;
+import com.ip.library.controllers.books.BookEntity;
 
 public interface UserRepository extends 
 			CrudRepository<UserEntity, Long>, 
diff --git a/SpringApp/library/src/main/java/com/ip/library/users/model/UserRole.java b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserRole.java
similarity index 91%
rename from SpringApp/library/src/main/java/com/ip/library/users/model/UserRole.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/users/UserRole.java
index 0eb24b8..be9cfad 100644
--- a/SpringApp/library/src/main/java/com/ip/library/users/model/UserRole.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserRole.java
@@ -1,4 +1,4 @@
-package com.ip.library.users.model;
+package com.ip.library.controllers.users;
 
 import org.springframework.security.core.GrantedAuthority;
 
diff --git a/SpringApp/library/src/main/java/com/ip/library/users/service/UserService.java b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserService.java
similarity index 95%
rename from SpringApp/library/src/main/java/com/ip/library/users/service/UserService.java
rename to SpringApp/library/src/main/java/com/ip/library/controllers/users/UserService.java
index 2a2e333..ef2473d 100644
--- a/SpringApp/library/src/main/java/com/ip/library/users/service/UserService.java
+++ b/SpringApp/library/src/main/java/com/ip/library/controllers/users/UserService.java
@@ -1,4 +1,4 @@
-package com.ip.library.users.service;
+package com.ip.library.controllers.users;
 
 import java.util.List;
 import java.util.Optional;
@@ -14,16 +14,13 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import com.ip.library.books.model.BookEntity;
-import com.ip.library.books.service.BookService;
+import com.ip.library.controllers.books.BookEntity;
+import com.ip.library.controllers.books.BookService;
 import com.ip.library.core.configuration.Constants;
 import com.ip.library.core.error.NotFoundException;
 import com.ip.library.core.jwt.JwtException;
 import com.ip.library.core.jwt.JwtProvider;
 import com.ip.library.core.security.UserPrincipal;
-import com.ip.library.users.model.UserEntity;
-import com.ip.library.users.model.UserRole;
-import com.ip.library.users.repository.UserRepository;
 
 @Service
 public class UserService implements UserDetailsService{
@@ -77,6 +74,8 @@ public class UserService implements UserDetailsService{
     public UserEntity create(UserEntity entity) {
         if (entity == null)
             throw new IllegalArgumentException("Entity is null");
+        if (entity.getPassword() == null)
+            throw new IllegalArgumentException("Entity.GetPassword is null");
         checkLoginUniqueness(entity.getLogin());
         final String password = Optional.ofNullable(entity.getPassword()).orElse("");
         entity.setPassword(
diff --git a/SpringApp/library/src/main/java/com/ip/library/core/jwt/JwtFilter.java b/SpringApp/library/src/main/java/com/ip/library/core/jwt/JwtFilter.java
index feea6f3..49f5bb7 100644
--- a/SpringApp/library/src/main/java/com/ip/library/core/jwt/JwtFilter.java
+++ b/SpringApp/library/src/main/java/com/ip/library/core/jwt/JwtFilter.java
@@ -10,7 +10,7 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import com.ip.library.users.service.UserService;
+import com.ip.library.controllers.users.UserService;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
diff --git a/SpringApp/library/src/main/java/com/ip/library/core/security/SecurityConfiguration.java b/SpringApp/library/src/main/java/com/ip/library/core/security/SecurityConfiguration.java
index 7d442c0..c20ff78 100644
--- a/SpringApp/library/src/main/java/com/ip/library/core/security/SecurityConfiguration.java
+++ b/SpringApp/library/src/main/java/com/ip/library/core/security/SecurityConfiguration.java
@@ -21,11 +21,11 @@ import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 
+import com.ip.library.controllers.users.UserRole;
+import com.ip.library.controllers.users.UserService;
 import com.ip.library.core.configuration.Constants;
 import com.ip.library.core.error.AdviceController;
 import com.ip.library.core.jwt.JwtFilter;
-import com.ip.library.users.model.UserRole;
-import com.ip.library.users.service.UserService;
 
 @Configuration
 @EnableWebSecurity
diff --git a/SpringApp/library/src/main/java/com/ip/library/core/security/UserPrincipal.java b/SpringApp/library/src/main/java/com/ip/library/core/security/UserPrincipal.java
index 24c505a..0ebe99d 100644
--- a/SpringApp/library/src/main/java/com/ip/library/core/security/UserPrincipal.java
+++ b/SpringApp/library/src/main/java/com/ip/library/core/security/UserPrincipal.java
@@ -6,7 +6,7 @@ import java.util.Set;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
-import com.ip.library.users.model.UserEntity;
+import com.ip.library.controllers.users.UserEntity;
 
 public class UserPrincipal implements UserDetails {
     private final long id;
diff --git a/SpringApp/library/src/test/java/com/ip/library/AuthorsTests.java b/SpringApp/library/src/test/java/com/ip/library/AuthorsTests.java
index 6b24ede..c42ccad 100644
--- a/SpringApp/library/src/test/java/com/ip/library/AuthorsTests.java
+++ b/SpringApp/library/src/test/java/com/ip/library/AuthorsTests.java
@@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataIntegrityViolationException;
 
+import com.ip.library.controllers.authors.AuthorEntity;
+import com.ip.library.controllers.authors.AuthorService;
 import com.ip.library.core.error.NotFoundException;
-import com.ip.library.authors.model.AuthorEntity;
-import com.ip.library.authors.service.AuthorService;
 
 @SpringBootTest
 class AuthorsTests {
diff --git a/SpringApp/library/src/test/java/com/ip/library/BooksTests.java b/SpringApp/library/src/test/java/com/ip/library/BooksTests.java
index 98e79a2..30491ec 100644
--- a/SpringApp/library/src/test/java/com/ip/library/BooksTests.java
+++ b/SpringApp/library/src/test/java/com/ip/library/BooksTests.java
@@ -11,12 +11,12 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataIntegrityViolationException;
 
 import com.ip.library.core.error.NotFoundException;
-import com.ip.library.types.model.TypeEntity;
-import com.ip.library.types.service.TypeService;
-import com.ip.library.authors.model.AuthorEntity;
-import com.ip.library.authors.service.AuthorService;
-import com.ip.library.books.model.BookEntity;
-import com.ip.library.books.service.BookService;
+import com.ip.library.controllers.authors.AuthorEntity;
+import com.ip.library.controllers.authors.AuthorService;
+import com.ip.library.controllers.books.BookEntity;
+import com.ip.library.controllers.books.BookService;
+import com.ip.library.controllers.types.TypeEntity;
+import com.ip.library.controllers.types.TypeService;
 
 @SpringBootTest
 class BooksTests {
diff --git a/SpringApp/library/src/test/java/com/ip/library/FavoritesTests.java b/SpringApp/library/src/test/java/com/ip/library/FavoritesTests.java
index f3427cf..8c3a5a9 100644
--- a/SpringApp/library/src/test/java/com/ip/library/FavoritesTests.java
+++ b/SpringApp/library/src/test/java/com/ip/library/FavoritesTests.java
@@ -9,12 +9,12 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import com.ip.library.books.model.BookEntity;
-import com.ip.library.books.service.BookService;
-import com.ip.library.types.model.TypeEntity;
-import com.ip.library.types.service.TypeService;
-import com.ip.library.users.model.UserEntity;
-import com.ip.library.users.service.UserService;
+import com.ip.library.controllers.books.BookEntity;
+import com.ip.library.controllers.books.BookService;
+import com.ip.library.controllers.types.TypeEntity;
+import com.ip.library.controllers.types.TypeService;
+import com.ip.library.controllers.users.UserEntity;
+import com.ip.library.controllers.users.UserService;
 
 @SpringBootTest
 class FavoritesTests {
diff --git a/SpringApp/library/src/test/java/com/ip/library/TypesTests.java b/SpringApp/library/src/test/java/com/ip/library/TypesTests.java
index c0dd067..dca78b6 100644
--- a/SpringApp/library/src/test/java/com/ip/library/TypesTests.java
+++ b/SpringApp/library/src/test/java/com/ip/library/TypesTests.java
@@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataIntegrityViolationException;
 
+import com.ip.library.controllers.types.TypeEntity;
+import com.ip.library.controllers.types.TypeService;
 import com.ip.library.core.error.NotFoundException;
-import com.ip.library.types.model.TypeEntity;
-import com.ip.library.types.service.TypeService;
 
 @SpringBootTest
 class TypesTests {
diff --git a/SpringApp/library/src/test/java/com/ip/library/UsersTests.java b/SpringApp/library/src/test/java/com/ip/library/UsersTests.java
index 76dae9a..1f4ba2f 100644
--- a/SpringApp/library/src/test/java/com/ip/library/UsersTests.java
+++ b/SpringApp/library/src/test/java/com/ip/library/UsersTests.java
@@ -7,16 +7,19 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
+import com.ip.library.controllers.users.UserEntity;
+import com.ip.library.controllers.users.UserRole;
+import com.ip.library.controllers.users.UserService;
 import com.ip.library.core.error.NotFoundException;
-import com.ip.library.users.model.UserEntity;
-import com.ip.library.users.model.UserRole;
-import com.ip.library.users.service.UserService;
 
 @SpringBootTest
 class UsersTests {
 	@Autowired
 	private UserService userService;
+	@Autowired
+    private PasswordEncoder passwordEncoder;
 	private UserEntity user;
 
 	@AfterEach
@@ -36,7 +39,7 @@ class UsersTests {
 	void createTest() {
 		Assertions.assertEquals(3, userService.getAll().size());
 		Assertions.assertEquals("user3", user.getLogin());
-		Assertions.assertEquals("aqw2sed45", user.getPassword());
+		Assertions.assertTrue(passwordEncoder.matches("aqw2sed45", user.getPassword()));
 		Assertions.assertEquals(UserRole.USER, user.getRole());
 		Assertions.assertEquals(0, user.getFavorites().size());
 	}
@@ -102,7 +105,7 @@ class UsersTests {
 	@Test
 	void nullPasswordTest() {
 		Assertions.assertThrows(
-			DataIntegrityViolationException.class, 
+			IllegalArgumentException.class, 
 			() -> userService.create(new UserEntity(user.getLogin() + "TEST", null))
 		);
 		Assertions.assertThrows(