diff --git a/car/src/main/java/cz/muni/pa165/car/App.java b/car/src/main/java/cz/muni/pa165/car/App.java
index ec41fdebf056f05855b63af3929b77b8a2924787..8d546b5142bc6cde3c95a98f00ed947ae323e2bb 100644
--- a/car/src/main/java/cz/muni/pa165/car/App.java
+++ b/car/src/main/java/cz/muni/pa165/car/App.java
@@ -1,6 +1,6 @@
 package cz.muni.pa165.car;
 
-import cz.muni.pa165.common_library.exceptions.RestExceptionHandler;
+import cz.muni.pa165.common_library.exception.RestExceptionHandler;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
diff --git a/car/src/main/java/cz/muni/pa165/car/service/CarComponentPairServiceImpl.java b/car/src/main/java/cz/muni/pa165/car/service/CarComponentPairServiceImpl.java
index a6306e7769280a1c5213c6d645b1662d847e4af3..e136a426eb93ec0974392fbf47d08df878456a0b 100644
--- a/car/src/main/java/cz/muni/pa165/car/service/CarComponentPairServiceImpl.java
+++ b/car/src/main/java/cz/muni/pa165/car/service/CarComponentPairServiceImpl.java
@@ -5,7 +5,7 @@ import cz.muni.pa165.car.data.repository.CarComponentRepository;
 import cz.muni.pa165.car.data.repository.CarRepository;
 import cz.muni.pa165.common_library.dtos.CarComponentDto;
 import cz.muni.pa165.common_library.dtos.CarDto;
-import cz.muni.pa165.common_library.exceptions.DatabaseException;
+import cz.muni.pa165.common_library.exception.DatabaseException;
 import cz.muni.pa165.common_library.racecomponents.CarComponent;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/car/src/main/java/cz/muni/pa165/car/service/CarDriverPairServiceImpl.java b/car/src/main/java/cz/muni/pa165/car/service/CarDriverPairServiceImpl.java
index f0ffb61cdb8f02f2a6864bafbadfcd30f8218679..68a4d81aae21765b8a9ad352fc3542d67fb3201d 100644
--- a/car/src/main/java/cz/muni/pa165/car/service/CarDriverPairServiceImpl.java
+++ b/car/src/main/java/cz/muni/pa165/car/service/CarDriverPairServiceImpl.java
@@ -5,7 +5,7 @@ import cz.muni.pa165.car.data.repository.CarRepository;
 import cz.muni.pa165.car.data.repository.DriverRepository;
 import cz.muni.pa165.common_library.dtos.CarDto;
 import cz.muni.pa165.common_library.dtos.DriverDto;
-import cz.muni.pa165.common_library.exceptions.DatabaseException;
+import cz.muni.pa165.common_library.exception.DatabaseException;
 import cz.muni.pa165.common_library.racecomponents.Driver;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/car/src/main/java/cz/muni/pa165/car/service/CarServiceImpl.java b/car/src/main/java/cz/muni/pa165/car/service/CarServiceImpl.java
index 6cc42cd38b13eef371dcac2de866ee0f7f94eb5c..628b91fd2f7939d50c718ed1d2378a7579f741e9 100644
--- a/car/src/main/java/cz/muni/pa165/car/service/CarServiceImpl.java
+++ b/car/src/main/java/cz/muni/pa165/car/service/CarServiceImpl.java
@@ -4,7 +4,7 @@ import cz.muni.pa165.car.data.repository.CarComponentRepository;
 import cz.muni.pa165.car.data.repository.CarRepository;
 import cz.muni.pa165.car.data.repository.DriverRepository;
 import cz.muni.pa165.common_library.dtos.CarDto;
-import cz.muni.pa165.common_library.exceptions.DatabaseException;
+import cz.muni.pa165.common_library.exception.DatabaseException;
 import cz.muni.pa165.common_library.racecomponents.Car;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/common_library/src/main/java/cz/muni/pa165/common_library/exceptions/DatabaseException.java b/common_library/src/main/java/cz/muni/pa165/common_library/exception/DatabaseException.java
similarity index 80%
rename from common_library/src/main/java/cz/muni/pa165/common_library/exceptions/DatabaseException.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/exception/DatabaseException.java
index 227b9a113ce56809dcc7ce7deedac992f9729096..52a05fb33cacbb98e03f839213e38e097aa68dd5 100644
--- a/common_library/src/main/java/cz/muni/pa165/common_library/exceptions/DatabaseException.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/exception/DatabaseException.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.common_library.exceptions;
+package cz.muni.pa165.common_library.exception;
 
 /**
  * Exception when a query does is not executed correctly.
diff --git a/common_library/src/main/java/cz/muni/pa165/common_library/exceptions/ExError.java b/common_library/src/main/java/cz/muni/pa165/common_library/exception/ExError.java
similarity index 89%
rename from common_library/src/main/java/cz/muni/pa165/common_library/exceptions/ExError.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/exception/ExError.java
index 9f7169aee1badf65d9f9f93b1209c2f18288d87f..e16b755b75acc9dd1dc1ca735038638312c7afa0 100644
--- a/common_library/src/main/java/cz/muni/pa165/common_library/exceptions/ExError.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/exception/ExError.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.common_library.exceptions;
+package cz.muni.pa165.common_library.exception;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.time.LocalDateTime;
diff --git a/common_library/src/main/java/cz/muni/pa165/common_library/exceptions/ResourceNotFoundException.java b/common_library/src/main/java/cz/muni/pa165/common_library/exception/ResourceNotFoundException.java
similarity index 80%
rename from common_library/src/main/java/cz/muni/pa165/common_library/exceptions/ResourceNotFoundException.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/exception/ResourceNotFoundException.java
index 84517c811e0a1362bf2b9f604e63b5f9137915a7..eaeb206f378b375c22c20ae431878d6ec5c698ff 100644
--- a/common_library/src/main/java/cz/muni/pa165/common_library/exceptions/ResourceNotFoundException.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/exception/ResourceNotFoundException.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.common_library.exceptions;
+package cz.muni.pa165.common_library.exception;
 
 /**
  * Exception when resource does not exist.
diff --git a/common_library/src/main/java/cz/muni/pa165/common_library/exceptions/RestExceptionHandler.java b/common_library/src/main/java/cz/muni/pa165/common_library/exception/RestExceptionHandler.java
similarity index 98%
rename from common_library/src/main/java/cz/muni/pa165/common_library/exceptions/RestExceptionHandler.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/exception/RestExceptionHandler.java
index 0c09416438ec422c9e234ae78fed089bd2eb5686..2fa79a3098fc9805deaad690d50971d912746804 100644
--- a/common_library/src/main/java/cz/muni/pa165/common_library/exceptions/RestExceptionHandler.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/exception/RestExceptionHandler.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.common_library.exceptions;
+package cz.muni.pa165.common_library.exception;
 
 import jakarta.persistence.EntityNotFoundException;
 import org.springframework.http.HttpHeaders;
diff --git a/component/src/main/java/cz/muni/pa165/component/service/ComponentService.java b/component/src/main/java/cz/muni/pa165/component/service/ComponentService.java
index 618e205d02a0ed68c16ddc2a3430fdabac011352..e311073a79507a5f2919670a721b4a926be7b114 100644
--- a/component/src/main/java/cz/muni/pa165/component/service/ComponentService.java
+++ b/component/src/main/java/cz/muni/pa165/component/service/ComponentService.java
@@ -1,7 +1,7 @@
 package cz.muni.pa165.component.service;
 
 import cz.muni.pa165.common_library.dtos.CarComponentDto;
-import cz.muni.pa165.common_library.exceptions.DatabaseException;
+import cz.muni.pa165.common_library.exception.DatabaseException;
 import cz.muni.pa165.common_library.racecomponents.CarComponent;
 import cz.muni.pa165.component.data.repository.ComponentRepositoryInterface;
 import java.util.List;
diff --git a/driver/src/main/java/cz/muni/pa165/driver/service/CarServiceImpl.java b/driver/src/main/java/cz/muni/pa165/driver/service/CarServiceImpl.java
index bedb933246daa4c74236edd0c21abeb9f60f8de1..e9b17968fe46ae81af90466841d7e76fad956720 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/service/CarServiceImpl.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/service/CarServiceImpl.java
@@ -1,7 +1,7 @@
 package cz.muni.pa165.driver.service;
 
 import cz.muni.pa165.common_library.dtos.DriverCarDto;
-import cz.muni.pa165.common_library.exceptions.ResourceNotFoundException;
+import cz.muni.pa165.common_library.exception.ResourceNotFoundException;
 import cz.muni.pa165.driver.data.repository.CarRepository;
 import cz.muni.pa165.driver.data.repository.DriverRepository;
 import cz.muni.pa165.driver.mapper.DriverCarMapper;
diff --git a/driver/src/main/java/cz/muni/pa165/driver/service/DriverServiceImpl.java b/driver/src/main/java/cz/muni/pa165/driver/service/DriverServiceImpl.java
index 8be73de0f7fa48223d3b26ff327bddd5ccdc396c..d5d3a153a0b5e328bafb6ecff4875e8d7eaddf8d 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/service/DriverServiceImpl.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/service/DriverServiceImpl.java
@@ -3,7 +3,7 @@ package cz.muni.pa165.driver.service;
 import cz.muni.pa165.common_library.dtos.DriverInsightDto;
 import cz.muni.pa165.common_library.dtos.DriverResponseDto;
 import cz.muni.pa165.common_library.dtos.DriverUpdateDto;
-import cz.muni.pa165.common_library.exceptions.ResourceNotFoundException;
+import cz.muni.pa165.common_library.exception.ResourceNotFoundException;
 import cz.muni.pa165.driver.data.repository.DriverRepository;
 import cz.muni.pa165.driver.mapper.DriverMapper;
 import java.util.List;
diff --git a/race/src/main/java/cz/muni/pa165/race/App.java b/race/src/main/java/cz/muni/pa165/race/App.java
index 44c63fc9cd9a1fcbdad5d9c59ea250c1d2c733a3..f690c949558466738253d1e62099738b8d74202b 100644
--- a/race/src/main/java/cz/muni/pa165/race/App.java
+++ b/race/src/main/java/cz/muni/pa165/race/App.java
@@ -1,6 +1,6 @@
 package cz.muni.pa165.race;
 
-import cz.muni.pa165.common_library.exceptions.RestExceptionHandler;
+import cz.muni.pa165.common_library.exception.RestExceptionHandler;
 import cz.muni.pa165.common_library.racecomponents.Car;
 import cz.muni.pa165.common_library.racecomponents.Driver;
 import cz.muni.pa165.common_library.racecomponents.Race;
diff --git a/race/src/main/java/cz/muni/pa165/race/service/RaceService.java b/race/src/main/java/cz/muni/pa165/race/service/RaceService.java
index 45ea193576a5eb705bc64551cfd26f7209550229..882afe57722efb2fae1869ee5c2c0d53a5343a71 100644
--- a/race/src/main/java/cz/muni/pa165/race/service/RaceService.java
+++ b/race/src/main/java/cz/muni/pa165/race/service/RaceService.java
@@ -1,7 +1,7 @@
 package cz.muni.pa165.race.service;
 
 import cz.muni.pa165.common_library.dtos.RaceDto;
-import cz.muni.pa165.common_library.exceptions.DatabaseException;
+import cz.muni.pa165.common_library.exception.DatabaseException;
 import cz.muni.pa165.common_library.racecomponents.Car;
 import cz.muni.pa165.common_library.racecomponents.Driver;
 import cz.muni.pa165.common_library.racecomponents.Race;
diff --git a/race/src/main/java/cz/muni/pa165/race/service/SeasonService.java b/race/src/main/java/cz/muni/pa165/race/service/SeasonService.java
index ffefa5a78246f7db69b46b8af3fcd92b08542a6e..0519d94d6f23dc6021de6caea1c15e4f2fbe2c5a 100644
--- a/race/src/main/java/cz/muni/pa165/race/service/SeasonService.java
+++ b/race/src/main/java/cz/muni/pa165/race/service/SeasonService.java
@@ -2,7 +2,7 @@ package cz.muni.pa165.race.service;
 
 import cz.muni.pa165.common_library.dtos.RaceNameDto;
 import cz.muni.pa165.common_library.dtos.SeasonDto;
-import cz.muni.pa165.common_library.exceptions.DatabaseException;
+import cz.muni.pa165.common_library.exception.DatabaseException;
 import cz.muni.pa165.common_library.racecomponents.Race;
 import cz.muni.pa165.common_library.racecomponents.Season;
 import cz.muni.pa165.race.api.RaceNameDto;