diff --git a/build.gradle b/build.gradle
index 4fec34e..af4f55f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,6 +34,7 @@ dependencies {
 	implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
 	implementation 'com.fasterxml.jackson.core:jackson-databind'
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
 }
 
 tasks.named('test') {
diff --git a/src/main/java/it/numble/hittracker/AppConfig.java b/src/main/java/it/numble/hittracker/common/config/AppConfig.java
similarity index 91%
rename from src/main/java/it/numble/hittracker/AppConfig.java
rename to src/main/java/it/numble/hittracker/common/config/AppConfig.java
index ceaf7a7..0c13ac4 100644
--- a/src/main/java/it/numble/hittracker/AppConfig.java
+++ b/src/main/java/it/numble/hittracker/common/config/AppConfig.java
@@ -1,4 +1,4 @@
-package it.numble.hittracker;
+package it.numble.hittracker.common.config;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/it/numble/hittracker/exception/BaseException.java b/src/main/java/it/numble/hittracker/common/exception/BaseException.java
similarity index 87%
rename from src/main/java/it/numble/hittracker/exception/BaseException.java
rename to src/main/java/it/numble/hittracker/common/exception/BaseException.java
index 567c51d..752a4f2 100644
--- a/src/main/java/it/numble/hittracker/exception/BaseException.java
+++ b/src/main/java/it/numble/hittracker/common/exception/BaseException.java
@@ -1,4 +1,4 @@
-package it.numble.hittracker.exception;
+package it.numble.hittracker.common.exception;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/it/numble/hittracker/exception/handler/GlobalExceptionHandler.java b/src/main/java/it/numble/hittracker/common/exception/handler/GlobalExceptionHandler.java
similarity index 86%
rename from src/main/java/it/numble/hittracker/exception/handler/GlobalExceptionHandler.java
rename to src/main/java/it/numble/hittracker/common/exception/handler/GlobalExceptionHandler.java
index e5ed96e..514ce86 100644
--- a/src/main/java/it/numble/hittracker/exception/handler/GlobalExceptionHandler.java
+++ b/src/main/java/it/numble/hittracker/common/exception/handler/GlobalExceptionHandler.java
@@ -1,8 +1,8 @@
-package it.numble.hittracker.exception.handler;
+package it.numble.hittracker.common.exception.handler;
 
 import it.numble.hittracker.controller.response.Response;
 import it.numble.hittracker.controller.response.dto.Empty;
-import it.numble.hittracker.exception.BaseException;
+import it.numble.hittracker.common.exception.BaseException;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;