diff --git a/.run/Application.run.xml b/.run/Application.run.xml
index 7ce3f58..0b0b445 100644
--- a/.run/Application.run.xml
+++ b/.run/Application.run.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/.run/ApplicationTest.run.xml b/.run/ApplicationTest.run.xml
index 2d103aa..41041d8 100644
--- a/.run/ApplicationTest.run.xml
+++ b/.run/ApplicationTest.run.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/Application.java b/src/main/java/dev/mars3142/fhq/timezone/Application.java
similarity index 86%
rename from src/main/java/dev/mars3142/fhq/timezone_service/Application.java
rename to src/main/java/dev/mars3142/fhq/timezone/Application.java
index 49b06f8..c3d1112 100644
--- a/src/main/java/dev/mars3142/fhq/timezone_service/Application.java
+++ b/src/main/java/dev/mars3142/fhq/timezone/Application.java
@@ -1,4 +1,4 @@
-package dev.mars3142.fhq.timezone_service;
+package dev.mars3142.fhq.timezone;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/config/AppConfig.java b/src/main/java/dev/mars3142/fhq/timezone/config/AppConfig.java
similarity index 96%
rename from src/main/java/dev/mars3142/fhq/timezone_service/config/AppConfig.java
rename to src/main/java/dev/mars3142/fhq/timezone/config/AppConfig.java
index 394db3a..ef593ee 100644
--- a/src/main/java/dev/mars3142/fhq/timezone_service/config/AppConfig.java
+++ b/src/main/java/dev/mars3142/fhq/timezone/config/AppConfig.java
@@ -1,4 +1,4 @@
-package dev.mars3142.fhq.timezone_service.config;
+package dev.mars3142.fhq.timezone.config;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/config/OpenAPIConfig.java b/src/main/java/dev/mars3142/fhq/timezone/config/OpenAPIConfig.java
similarity index 92%
rename from src/main/java/dev/mars3142/fhq/timezone_service/config/OpenAPIConfig.java
rename to src/main/java/dev/mars3142/fhq/timezone/config/OpenAPIConfig.java
index 590d761..1417150 100644
--- a/src/main/java/dev/mars3142/fhq/timezone_service/config/OpenAPIConfig.java
+++ b/src/main/java/dev/mars3142/fhq/timezone/config/OpenAPIConfig.java
@@ -1,4 +1,4 @@
-package dev.mars3142.fhq.timezone_service.config;
+package dev.mars3142.fhq.timezone.config;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info;
diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/config/WebConfig.java b/src/main/java/dev/mars3142/fhq/timezone/config/WebConfig.java
similarity index 90%
rename from src/main/java/dev/mars3142/fhq/timezone_service/config/WebConfig.java
rename to src/main/java/dev/mars3142/fhq/timezone/config/WebConfig.java
index b7598c0..76b4290 100644
--- a/src/main/java/dev/mars3142/fhq/timezone_service/config/WebConfig.java
+++ b/src/main/java/dev/mars3142/fhq/timezone/config/WebConfig.java
@@ -1,4 +1,4 @@
-package dev.mars3142.fhq.timezone_service.config;
+package dev.mars3142.fhq.timezone.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/exceptions/NotFoundException.java b/src/main/java/dev/mars3142/fhq/timezone/exceptions/NotFoundException.java
similarity index 79%
rename from src/main/java/dev/mars3142/fhq/timezone_service/exceptions/NotFoundException.java
rename to src/main/java/dev/mars3142/fhq/timezone/exceptions/NotFoundException.java
index 7e22ffc..b586808 100644
--- a/src/main/java/dev/mars3142/fhq/timezone_service/exceptions/NotFoundException.java
+++ b/src/main/java/dev/mars3142/fhq/timezone/exceptions/NotFoundException.java
@@ -1,4 +1,4 @@
-package dev.mars3142.fhq.timezone_service.exceptions;
+package dev.mars3142.fhq.timezone.exceptions;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/controllers/TimezoneController.java b/src/main/java/dev/mars3142/fhq/timezone/timezone/controllers/TimezoneController.java
similarity index 91%
rename from src/main/java/dev/mars3142/fhq/timezone_service/timezone/controllers/TimezoneController.java
rename to src/main/java/dev/mars3142/fhq/timezone/timezone/controllers/TimezoneController.java
index 24d75a8..5df64f5 100644
--- a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/controllers/TimezoneController.java
+++ b/src/main/java/dev/mars3142/fhq/timezone/timezone/controllers/TimezoneController.java
@@ -1,7 +1,7 @@
-package dev.mars3142.fhq.timezone_service.timezone.controllers;
+package dev.mars3142.fhq.timezone.timezone.controllers;
-import dev.mars3142.fhq.timezone_service.timezone.domain.model.response.TimezoneResponse;
-import dev.mars3142.fhq.timezone_service.timezone.service.TimezoneService;
+import dev.mars3142.fhq.timezone.timezone.domain.model.response.TimezoneResponse;
+import dev.mars3142.fhq.timezone.timezone.service.TimezoneService;
import lombok.RequiredArgsConstructor;
import lombok.val;
import org.springframework.data.domain.Page;
diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/entities/response/IPApiResponse.java b/src/main/java/dev/mars3142/fhq/timezone/timezone/domain/entities/response/IPApiResponse.java
similarity index 79%
rename from src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/entities/response/IPApiResponse.java
rename to src/main/java/dev/mars3142/fhq/timezone/timezone/domain/entities/response/IPApiResponse.java
index 1a23b68..d8628a2 100644
--- a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/entities/response/IPApiResponse.java
+++ b/src/main/java/dev/mars3142/fhq/timezone/timezone/domain/entities/response/IPApiResponse.java
@@ -1,4 +1,4 @@
-package dev.mars3142.fhq.timezone_service.timezone.domain.entities.response;
+package dev.mars3142.fhq.timezone.timezone.domain.entities.response;
public record IPApiResponse(String status, String country, String countryCode, String region, String regionName,
String city, String zip, String lat, String lon, String timezone, String isp, String or,
diff --git a/src/main/java/dev/mars3142/fhq/timezone/timezone/domain/entities/response/IpifyResponse.java b/src/main/java/dev/mars3142/fhq/timezone/timezone/domain/entities/response/IpifyResponse.java
new file mode 100644
index 0000000..9fb0cde
--- /dev/null
+++ b/src/main/java/dev/mars3142/fhq/timezone/timezone/domain/entities/response/IpifyResponse.java
@@ -0,0 +1,5 @@
+package dev.mars3142.fhq.timezone.timezone.domain.entities.response;
+
+public record IpifyResponse(String ip) {
+
+}
diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/entities/response/TimeApiTimezoneZoneResponse.java b/src/main/java/dev/mars3142/fhq/timezone/timezone/domain/entities/response/TimeApiTimezoneZoneResponse.java
similarity index 60%
rename from src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/entities/response/TimeApiTimezoneZoneResponse.java
rename to src/main/java/dev/mars3142/fhq/timezone/timezone/domain/entities/response/TimeApiTimezoneZoneResponse.java
index f4f4953..e50a45e 100644
--- a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/entities/response/TimeApiTimezoneZoneResponse.java
+++ b/src/main/java/dev/mars3142/fhq/timezone/timezone/domain/entities/response/TimeApiTimezoneZoneResponse.java
@@ -1,4 +1,4 @@
-package dev.mars3142.fhq.timezone_service.timezone.domain.entities.response;
+package dev.mars3142.fhq.timezone.timezone.domain.entities.response;
public record TimeApiTimezoneZoneResponse(Interval dstInterval) {
diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/response/TimezoneResponse.java b/src/main/java/dev/mars3142/fhq/timezone/timezone/domain/model/response/TimezoneResponse.java
similarity index 67%
rename from src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/response/TimezoneResponse.java
rename to src/main/java/dev/mars3142/fhq/timezone/timezone/domain/model/response/TimezoneResponse.java
index b5329f6..b13ddf1 100644
--- a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/response/TimezoneResponse.java
+++ b/src/main/java/dev/mars3142/fhq/timezone/timezone/domain/model/response/TimezoneResponse.java
@@ -1,4 +1,4 @@
-package dev.mars3142.fhq.timezone_service.timezone.domain.model.response;
+package dev.mars3142.fhq.timezone.timezone.domain.model.response;
import lombok.Getter;
import lombok.Setter;
diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/TimezoneService.java b/src/main/java/dev/mars3142/fhq/timezone/timezone/service/TimezoneService.java
similarity index 61%
rename from src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/TimezoneService.java
rename to src/main/java/dev/mars3142/fhq/timezone/timezone/service/TimezoneService.java
index b22f0b5..1547a54 100644
--- a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/TimezoneService.java
+++ b/src/main/java/dev/mars3142/fhq/timezone/timezone/service/TimezoneService.java
@@ -1,7 +1,7 @@
-package dev.mars3142.fhq.timezone_service.timezone.service;
+package dev.mars3142.fhq.timezone.timezone.service;
-import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.IPApiResponse;
-import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.TimeApiTimezoneZoneResponse;
+import dev.mars3142.fhq.timezone.timezone.domain.entities.response.IPApiResponse;
+import dev.mars3142.fhq.timezone.timezone.domain.entities.response.TimeApiTimezoneZoneResponse;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimezoneServiceImpl.java b/src/main/java/dev/mars3142/fhq/timezone/timezone/service/impl/TimezoneServiceImpl.java
similarity index 89%
rename from src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimezoneServiceImpl.java
rename to src/main/java/dev/mars3142/fhq/timezone/timezone/service/impl/TimezoneServiceImpl.java
index e9de16c..a0da9ef 100644
--- a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimezoneServiceImpl.java
+++ b/src/main/java/dev/mars3142/fhq/timezone/timezone/service/impl/TimezoneServiceImpl.java
@@ -1,10 +1,10 @@
-package dev.mars3142.fhq.timezone_service.timezone.service.impl;
+package dev.mars3142.fhq.timezone.timezone.service.impl;
-import dev.mars3142.fhq.timezone_service.exceptions.NotFoundException;
-import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.IPApiResponse;
-import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.IpifyResponse;
-import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.TimeApiTimezoneZoneResponse;
-import dev.mars3142.fhq.timezone_service.timezone.service.TimezoneService;
+import dev.mars3142.fhq.timezone.exceptions.NotFoundException;
+import dev.mars3142.fhq.timezone.timezone.domain.entities.response.IPApiResponse;
+import dev.mars3142.fhq.timezone.timezone.domain.entities.response.IpifyResponse;
+import dev.mars3142.fhq.timezone.timezone.domain.entities.response.TimeApiTimezoneZoneResponse;
+import dev.mars3142.fhq.timezone.timezone.service.TimezoneService;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/entities/response/IpifyResponse.java b/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/entities/response/IpifyResponse.java
deleted file mode 100644
index 7035c88..0000000
--- a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/entities/response/IpifyResponse.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package dev.mars3142.fhq.timezone_service.timezone.domain.entities.response;
-
-public record IpifyResponse(String ip) {
-
-}
diff --git a/src/test/java/dev/mars3142/fhq/timezone_service/ApplicationTests.java b/src/test/java/dev/mars3142/fhq/timezone/ApplicationTests.java
similarity index 80%
rename from src/test/java/dev/mars3142/fhq/timezone_service/ApplicationTests.java
rename to src/test/java/dev/mars3142/fhq/timezone/ApplicationTests.java
index 1e620cb..68d0622 100644
--- a/src/test/java/dev/mars3142/fhq/timezone_service/ApplicationTests.java
+++ b/src/test/java/dev/mars3142/fhq/timezone/ApplicationTests.java
@@ -1,4 +1,4 @@
-package dev.mars3142.fhq.timezone_service;
+package dev.mars3142.fhq.timezone;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
diff --git a/src/test/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimezoneServiceImplTest.java b/src/test/java/dev/mars3142/fhq/timezone/timezone/service/impl/TimezoneServiceImplTest.java
similarity index 96%
rename from src/test/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimezoneServiceImplTest.java
rename to src/test/java/dev/mars3142/fhq/timezone/timezone/service/impl/TimezoneServiceImplTest.java
index 2f35f0b..3cfe7e4 100644
--- a/src/test/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimezoneServiceImplTest.java
+++ b/src/test/java/dev/mars3142/fhq/timezone/timezone/service/impl/TimezoneServiceImplTest.java
@@ -1,4 +1,4 @@
-package dev.mars3142.fhq.timezone_service.timezone.service.impl;
+package dev.mars3142.fhq.timezone.timezone.service.impl;
import lombok.val;
import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/dev/mars3142/fhq/timezone_service/timezone/web/controllers/TimezoneControllerTest.java b/src/test/java/dev/mars3142/fhq/timezone/timezone/web/controllers/TimezoneControllerTest.java
similarity index 96%
rename from src/test/java/dev/mars3142/fhq/timezone_service/timezone/web/controllers/TimezoneControllerTest.java
rename to src/test/java/dev/mars3142/fhq/timezone/timezone/web/controllers/TimezoneControllerTest.java
index c9c0ecc..3df009d 100644
--- a/src/test/java/dev/mars3142/fhq/timezone_service/timezone/web/controllers/TimezoneControllerTest.java
+++ b/src/test/java/dev/mars3142/fhq/timezone/timezone/web/controllers/TimezoneControllerTest.java
@@ -1,4 +1,4 @@
-package dev.mars3142.fhq.timezone_service.timezone.web.controllers;
+package dev.mars3142.fhq.timezone.timezone.web.controllers;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DisplayName;