diff --git a/src/main/java/wtf/beatrice/releasehive/Main.java b/src/main/java/wtf/beatrice/releasehive/Main.java
index fd897fa..11e1a9e 100644
--- a/src/main/java/wtf/beatrice/releasehive/Main.java
+++ b/src/main/java/wtf/beatrice/releasehive/Main.java
@@ -7,7 +7,7 @@ import org.hibernate.Transaction;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import wtf.beatrice.releasehive.db.HibernateManager;
-import wtf.beatrice.releasehive.model.User;
+import wtf.beatrice.releasehive.models.User;
 
 import java.util.List;
 
diff --git a/src/main/java/wtf/beatrice/releasehive/config/ApplicationConfiguration.java b/src/main/java/wtf/beatrice/releasehive/config/ApplicationConfiguration.java
index e1485b9..5393c52 100644
--- a/src/main/java/wtf/beatrice/releasehive/config/ApplicationConfiguration.java
+++ b/src/main/java/wtf/beatrice/releasehive/config/ApplicationConfiguration.java
@@ -10,7 +10,7 @@ import org.springframework.security.config.annotation.authentication.configurati
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import wtf.beatrice.releasehive.repository.UserRepository;
+import wtf.beatrice.releasehive.repositories.UserRepository;
 
 @Configuration
 public class ApplicationConfiguration
diff --git a/src/main/java/wtf/beatrice/releasehive/config/JWTAuthenticationFilter.java b/src/main/java/wtf/beatrice/releasehive/config/JWTAuthenticationFilter.java
index 51c1a11..7ee52c7 100644
--- a/src/main/java/wtf/beatrice/releasehive/config/JWTAuthenticationFilter.java
+++ b/src/main/java/wtf/beatrice/releasehive/config/JWTAuthenticationFilter.java
@@ -13,9 +13,9 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.servlet.HandlerExceptionResolver;
-import wtf.beatrice.releasehive.model.User;
-import wtf.beatrice.releasehive.service.JWTService;
-import wtf.beatrice.releasehive.service.UserDetailsExtendedService;
+import wtf.beatrice.releasehive.models.User;
+import wtf.beatrice.releasehive.services.JWTService;
+import wtf.beatrice.releasehive.services.UserDetailsExtendedService;
 
 import java.io.IOException;
 
diff --git a/src/main/java/wtf/beatrice/releasehive/dto/LoginUserDto.java b/src/main/java/wtf/beatrice/releasehive/dtos/LoginUserDto.java
similarity index 90%
rename from src/main/java/wtf/beatrice/releasehive/dto/LoginUserDto.java
rename to src/main/java/wtf/beatrice/releasehive/dtos/LoginUserDto.java
index 42e9e97..10d0401 100644
--- a/src/main/java/wtf/beatrice/releasehive/dto/LoginUserDto.java
+++ b/src/main/java/wtf/beatrice/releasehive/dtos/LoginUserDto.java
@@ -1,4 +1,4 @@
-package wtf.beatrice.releasehive.dto;
+package wtf.beatrice.releasehive.dtos;
 
 public class LoginUserDto
 {
diff --git a/src/main/java/wtf/beatrice/releasehive/dto/RegisterUserDto.java b/src/main/java/wtf/beatrice/releasehive/dtos/RegisterUserDto.java
similarity index 93%
rename from src/main/java/wtf/beatrice/releasehive/dto/RegisterUserDto.java
rename to src/main/java/wtf/beatrice/releasehive/dtos/RegisterUserDto.java
index 5d24609..c246553 100644
--- a/src/main/java/wtf/beatrice/releasehive/dto/RegisterUserDto.java
+++ b/src/main/java/wtf/beatrice/releasehive/dtos/RegisterUserDto.java
@@ -1,4 +1,4 @@
-package wtf.beatrice.releasehive.dto;
+package wtf.beatrice.releasehive.dtos;
 
 public class RegisterUserDto
 {
diff --git a/src/main/java/wtf/beatrice/releasehive/exceptions/GlobalExceptionHandler.java b/src/main/java/wtf/beatrice/releasehive/exceptions/RestExceptionHandler.java
similarity index 95%
rename from src/main/java/wtf/beatrice/releasehive/exceptions/GlobalExceptionHandler.java
rename to src/main/java/wtf/beatrice/releasehive/exceptions/RestExceptionHandler.java
index 8d5af18..57cccb7 100644
--- a/src/main/java/wtf/beatrice/releasehive/exceptions/GlobalExceptionHandler.java
+++ b/src/main/java/wtf/beatrice/releasehive/exceptions/RestExceptionHandler.java
@@ -14,9 +14,9 @@ import java.nio.file.AccessDeniedException;
 import java.security.SignatureException;
 
 @RestControllerAdvice
-public class GlobalExceptionHandler
+public class RestExceptionHandler
 {
-    private static final Logger LOGGER = LogManager.getLogger(GlobalExceptionHandler.class);
+    private static final Logger LOGGER = LogManager.getLogger(RestExceptionHandler.class);
     private static final String DESCRIPTION_PROPERTY = "description";
 
     @ExceptionHandler(Exception.class)
diff --git a/src/main/java/wtf/beatrice/releasehive/model/LoginResponse.java b/src/main/java/wtf/beatrice/releasehive/models/LoginResponse.java
similarity index 93%
rename from src/main/java/wtf/beatrice/releasehive/model/LoginResponse.java
rename to src/main/java/wtf/beatrice/releasehive/models/LoginResponse.java
index 4ad4a98..2528143 100644
--- a/src/main/java/wtf/beatrice/releasehive/model/LoginResponse.java
+++ b/src/main/java/wtf/beatrice/releasehive/models/LoginResponse.java
@@ -1,4 +1,4 @@
-package wtf.beatrice.releasehive.model;
+package wtf.beatrice.releasehive.models;
 
 public class LoginResponse
 {
diff --git a/src/main/java/wtf/beatrice/releasehive/model/User.java b/src/main/java/wtf/beatrice/releasehive/models/User.java
similarity index 98%
rename from src/main/java/wtf/beatrice/releasehive/model/User.java
rename to src/main/java/wtf/beatrice/releasehive/models/User.java
index f0d2786..cbe223a 100644
--- a/src/main/java/wtf/beatrice/releasehive/model/User.java
+++ b/src/main/java/wtf/beatrice/releasehive/models/User.java
@@ -1,4 +1,4 @@
-package wtf.beatrice.releasehive.model;
+package wtf.beatrice.releasehive.models;
 
 
 import jakarta.persistence.*;
diff --git a/src/main/java/wtf/beatrice/releasehive/repository/UserRepository.java b/src/main/java/wtf/beatrice/releasehive/repositories/UserRepository.java
similarity index 79%
rename from src/main/java/wtf/beatrice/releasehive/repository/UserRepository.java
rename to src/main/java/wtf/beatrice/releasehive/repositories/UserRepository.java
index 91b288e..36f63b1 100644
--- a/src/main/java/wtf/beatrice/releasehive/repository/UserRepository.java
+++ b/src/main/java/wtf/beatrice/releasehive/repositories/UserRepository.java
@@ -1,8 +1,8 @@
-package wtf.beatrice.releasehive.repository;
+package wtf.beatrice.releasehive.repositories;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import wtf.beatrice.releasehive.model.User;
+import wtf.beatrice.releasehive.models.User;
 
 import java.util.Optional;
 import java.util.UUID;
diff --git a/src/main/java/wtf/beatrice/releasehive/resource/AccountResource.java b/src/main/java/wtf/beatrice/releasehive/resources/AccountResource.java
similarity index 80%
rename from src/main/java/wtf/beatrice/releasehive/resource/AccountResource.java
rename to src/main/java/wtf/beatrice/releasehive/resources/AccountResource.java
index 2a73c34..bef4c90 100644
--- a/src/main/java/wtf/beatrice/releasehive/resource/AccountResource.java
+++ b/src/main/java/wtf/beatrice/releasehive/resources/AccountResource.java
@@ -1,4 +1,4 @@
-package wtf.beatrice.releasehive.resource;
+package wtf.beatrice.releasehive.resources;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -6,12 +6,12 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import wtf.beatrice.releasehive.dto.LoginUserDto;
-import wtf.beatrice.releasehive.dto.RegisterUserDto;
-import wtf.beatrice.releasehive.model.LoginResponse;
-import wtf.beatrice.releasehive.model.User;
-import wtf.beatrice.releasehive.service.AccountService;
-import wtf.beatrice.releasehive.service.JWTService;
+import wtf.beatrice.releasehive.dtos.LoginUserDto;
+import wtf.beatrice.releasehive.dtos.RegisterUserDto;
+import wtf.beatrice.releasehive.models.LoginResponse;
+import wtf.beatrice.releasehive.models.User;
+import wtf.beatrice.releasehive.services.AccountService;
+import wtf.beatrice.releasehive.services.JWTService;
 
 @RestController
 @RequestMapping("/api/v1/auth")
diff --git a/src/main/java/wtf/beatrice/releasehive/resource/UserResource.java b/src/main/java/wtf/beatrice/releasehive/resources/UserResource.java
similarity index 90%
rename from src/main/java/wtf/beatrice/releasehive/resource/UserResource.java
rename to src/main/java/wtf/beatrice/releasehive/resources/UserResource.java
index 15424de..280594b 100644
--- a/src/main/java/wtf/beatrice/releasehive/resource/UserResource.java
+++ b/src/main/java/wtf/beatrice/releasehive/resources/UserResource.java
@@ -1,4 +1,4 @@
-package wtf.beatrice.releasehive.resource;
+package wtf.beatrice.releasehive.resources;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,8 +8,8 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import wtf.beatrice.releasehive.model.User;
-import wtf.beatrice.releasehive.service.UserService;
+import wtf.beatrice.releasehive.models.User;
+import wtf.beatrice.releasehive.services.UserService;
 
 import java.util.List;
 
diff --git a/src/main/java/wtf/beatrice/releasehive/service/AccountService.java b/src/main/java/wtf/beatrice/releasehive/service/AccountService.java
deleted file mode 100644
index 692f728..0000000
--- a/src/main/java/wtf/beatrice/releasehive/service/AccountService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package wtf.beatrice.releasehive.service;
-
-import wtf.beatrice.releasehive.dto.LoginUserDto;
-import wtf.beatrice.releasehive.dto.RegisterUserDto;
-import wtf.beatrice.releasehive.model.User;
-
-public interface AccountService
-{
-
-    User register(RegisterUserDto user);
-
-    User login(LoginUserDto user);
-}
diff --git a/src/main/java/wtf/beatrice/releasehive/services/AccountService.java b/src/main/java/wtf/beatrice/releasehive/services/AccountService.java
new file mode 100644
index 0000000..4badb3c
--- /dev/null
+++ b/src/main/java/wtf/beatrice/releasehive/services/AccountService.java
@@ -0,0 +1,13 @@
+package wtf.beatrice.releasehive.services;
+
+import wtf.beatrice.releasehive.dtos.LoginUserDto;
+import wtf.beatrice.releasehive.dtos.RegisterUserDto;
+import wtf.beatrice.releasehive.models.User;
+
+public interface AccountService
+{
+
+    User register(RegisterUserDto user);
+
+    User login(LoginUserDto user);
+}
diff --git a/src/main/java/wtf/beatrice/releasehive/service/AccountServiceImpl.java b/src/main/java/wtf/beatrice/releasehive/services/AccountServiceImpl.java
similarity index 86%
rename from src/main/java/wtf/beatrice/releasehive/service/AccountServiceImpl.java
rename to src/main/java/wtf/beatrice/releasehive/services/AccountServiceImpl.java
index 5e187a1..0a8ee00 100644
--- a/src/main/java/wtf/beatrice/releasehive/service/AccountServiceImpl.java
+++ b/src/main/java/wtf/beatrice/releasehive/services/AccountServiceImpl.java
@@ -1,14 +1,14 @@
-package wtf.beatrice.releasehive.service;
+package wtf.beatrice.releasehive.services;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
-import wtf.beatrice.releasehive.dto.LoginUserDto;
-import wtf.beatrice.releasehive.dto.RegisterUserDto;
-import wtf.beatrice.releasehive.model.User;
-import wtf.beatrice.releasehive.repository.UserRepository;
+import wtf.beatrice.releasehive.dtos.LoginUserDto;
+import wtf.beatrice.releasehive.dtos.RegisterUserDto;
+import wtf.beatrice.releasehive.models.User;
+import wtf.beatrice.releasehive.repositories.UserRepository;
 
 @Service
 public class AccountServiceImpl implements AccountService {
diff --git a/src/main/java/wtf/beatrice/releasehive/service/JWTService.java b/src/main/java/wtf/beatrice/releasehive/services/JWTService.java
similarity index 96%
rename from src/main/java/wtf/beatrice/releasehive/service/JWTService.java
rename to src/main/java/wtf/beatrice/releasehive/services/JWTService.java
index 3919c90..7f77169 100644
--- a/src/main/java/wtf/beatrice/releasehive/service/JWTService.java
+++ b/src/main/java/wtf/beatrice/releasehive/services/JWTService.java
@@ -1,4 +1,4 @@
-package wtf.beatrice.releasehive.service;
+package wtf.beatrice.releasehive.services;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
@@ -7,7 +7,7 @@ import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import wtf.beatrice.releasehive.model.User;
+import wtf.beatrice.releasehive.models.User;
 
 import java.security.Key;
 import java.util.Date;
diff --git a/src/main/java/wtf/beatrice/releasehive/service/UserDetailsExtendedService.java b/src/main/java/wtf/beatrice/releasehive/services/UserDetailsExtendedService.java
similarity index 84%
rename from src/main/java/wtf/beatrice/releasehive/service/UserDetailsExtendedService.java
rename to src/main/java/wtf/beatrice/releasehive/services/UserDetailsExtendedService.java
index ae23761..9eaec86 100644
--- a/src/main/java/wtf/beatrice/releasehive/service/UserDetailsExtendedService.java
+++ b/src/main/java/wtf/beatrice/releasehive/services/UserDetailsExtendedService.java
@@ -1,10 +1,10 @@
-package wtf.beatrice.releasehive.service;
+package wtf.beatrice.releasehive.services;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
-import wtf.beatrice.releasehive.model.User;
-import wtf.beatrice.releasehive.repository.UserRepository;
+import wtf.beatrice.releasehive.models.User;
+import wtf.beatrice.releasehive.repositories.UserRepository;
 
 @Service
 public class UserDetailsExtendedService {
diff --git a/src/main/java/wtf/beatrice/releasehive/service/UserService.java b/src/main/java/wtf/beatrice/releasehive/services/UserService.java
similarity index 74%
rename from src/main/java/wtf/beatrice/releasehive/service/UserService.java
rename to src/main/java/wtf/beatrice/releasehive/services/UserService.java
index ef74e84..1287d98 100644
--- a/src/main/java/wtf/beatrice/releasehive/service/UserService.java
+++ b/src/main/java/wtf/beatrice/releasehive/services/UserService.java
@@ -1,9 +1,9 @@
-package wtf.beatrice.releasehive.service;
+package wtf.beatrice.releasehive.services;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import wtf.beatrice.releasehive.model.User;
-import wtf.beatrice.releasehive.repository.UserRepository;
+import wtf.beatrice.releasehive.models.User;
+import wtf.beatrice.releasehive.repositories.UserRepository;
 
 import java.util.List;
 
diff --git a/src/main/java/wtf/beatrice/releasehive/util/JsonUtil.java b/src/main/java/wtf/beatrice/releasehive/utils/JsonUtil.java
similarity index 94%
rename from src/main/java/wtf/beatrice/releasehive/util/JsonUtil.java
rename to src/main/java/wtf/beatrice/releasehive/utils/JsonUtil.java
index a73e3ce..ab1d7e4 100644
--- a/src/main/java/wtf/beatrice/releasehive/util/JsonUtil.java
+++ b/src/main/java/wtf/beatrice/releasehive/utils/JsonUtil.java
@@ -1,4 +1,4 @@
-package wtf.beatrice.releasehive.util;
+package wtf.beatrice.releasehive.utils;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml
index 35c55a8..1371c16 100644
--- a/src/main/resources/hibernate.cfg.xml
+++ b/src/main/resources/hibernate.cfg.xml
@@ -22,7 +22,7 @@
         <property name="hibernate.hbm2ddl.auto">update</property>
 
         <!-- Annotated entity classes -->
-        <mapping class="wtf.beatrice.releasehive.model.User"/>
+        <mapping class="wtf.beatrice.releasehive.models.User"/>
 
     </session-factory>
 </hibernate-configuration>