diff --git a/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt b/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt
index 1b205fa3..20161a5f 100644
--- a/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt
+++ b/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt
@@ -32,7 +32,7 @@ import com.sadellie.unitto.feature.datecalculator.navigation.dateCalculatorGraph
 import com.sadellie.unitto.feature.settings.navigation.navigateToSettings
 import com.sadellie.unitto.feature.settings.navigation.navigateToUnitGroups
 import com.sadellie.unitto.feature.settings.navigation.settingGraph
-import com.sadellie.unitto.timezone.navigation.timeZoneGraph
+import com.sadellie.unitto.feature.timezone.navigation.timeZoneGraph
 import io.github.sadellie.themmo.ThemmoController
 
 @Composable
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneScreen.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/AddTimeZoneScreen.kt
similarity index 97%
rename from feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneScreen.kt
rename to feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/AddTimeZoneScreen.kt
index 11f41f5c..516e7c4c 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneScreen.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/AddTimeZoneScreen.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.timezone
+package com.sadellie.unitto.feature.timezone
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.LinearOutSlowInEasing
@@ -48,7 +48,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.UnittoSearchBar
 import com.sadellie.unitto.data.model.UnittoTimeZone
-import com.sadellie.unitto.timezone.components.SelectableTimeZone
+import com.sadellie.unitto.feature.timezone.components.SelectableTimeZone
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import java.time.ZonedDateTime
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneUIState.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/AddTimeZoneUIState.kt
similarity index 95%
rename from feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneUIState.kt
rename to feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/AddTimeZoneUIState.kt
index 6b997383..977650e6 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneUIState.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/AddTimeZoneUIState.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.timezone
+package com.sadellie.unitto.feature.timezone
 
 import androidx.compose.ui.text.input.TextFieldValue
 import com.sadellie.unitto.data.model.UnittoTimeZone
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneViewModel.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/AddTimeZoneViewModel.kt
similarity index 98%
rename from feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneViewModel.kt
rename to feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/AddTimeZoneViewModel.kt
index 73c2778f..8f266b51 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneViewModel.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/AddTimeZoneViewModel.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.timezone
+package com.sadellie.unitto.feature.timezone
 
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneScreen.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneScreen.kt
similarity index 99%
rename from feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneScreen.kt
rename to feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneScreen.kt
index 55ae0560..85e04d19 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneScreen.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneScreen.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.timezone
+package com.sadellie.unitto.feature.timezone
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
@@ -89,7 +89,7 @@ import com.sadellie.unitto.core.ui.theme.TypographyUnitto
 import com.sadellie.unitto.core.ui.theme.DarkThemeColors
 import com.sadellie.unitto.core.ui.theme.LightThemeColors
 import com.sadellie.unitto.data.model.UnittoTimeZone
-import com.sadellie.unitto.timezone.components.TimeZoneListItem
+import com.sadellie.unitto.feature.timezone.components.TimeZoneListItem
 import io.github.sadellie.themmo.Themmo
 import io.github.sadellie.themmo.rememberThemmoController
 import kotlinx.coroutines.delay
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneUIState.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneUIState.kt
similarity index 95%
rename from feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneUIState.kt
rename to feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneUIState.kt
index 2584b6c7..5b0ef725 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneUIState.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneUIState.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.timezone
+package com.sadellie.unitto.feature.timezone
 
 import com.sadellie.unitto.data.model.UnittoTimeZone
 import java.time.ZonedDateTime
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneViewModel.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneViewModel.kt
similarity index 98%
rename from feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneViewModel.kt
rename to feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneViewModel.kt
index 09e4ff2e..efb9f3c8 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneViewModel.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneViewModel.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.timezone
+package com.sadellie.unitto.feature.timezone
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/components/SelectableTimeZone.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/SelectableTimeZone.kt
similarity index 97%
rename from feature/timezone/src/main/java/com/sadellie/unitto/timezone/components/SelectableTimeZone.kt
rename to feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/SelectableTimeZone.kt
index 7c0b50b6..24950a7d 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/components/SelectableTimeZone.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/SelectableTimeZone.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.timezone.components
+package com.sadellie.unitto.feature.timezone.components
 
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.ListItem
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/components/TimeZoneListItem.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/TimeZoneListItem.kt
similarity index 99%
rename from feature/timezone/src/main/java/com/sadellie/unitto/timezone/components/TimeZoneListItem.kt
rename to feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/TimeZoneListItem.kt
index edd3670d..1a2ef1a9 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/components/TimeZoneListItem.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/TimeZoneListItem.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.timezone.components
+package com.sadellie.unitto.feature.timezone.components
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/navigation/TimeZoneNavigation.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/navigation/TimeZoneNavigation.kt
similarity index 94%
rename from feature/timezone/src/main/java/com/sadellie/unitto/timezone/navigation/TimeZoneNavigation.kt
rename to feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/navigation/TimeZoneNavigation.kt
index ff992ec5..da673b0c 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/navigation/TimeZoneNavigation.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/navigation/TimeZoneNavigation.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.timezone.navigation
+package com.sadellie.unitto.feature.timezone.navigation
 
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
@@ -27,8 +27,8 @@ import androidx.navigation.navDeepLink
 import com.sadellie.unitto.core.base.TopLevelDestinations
 import com.sadellie.unitto.core.ui.unittoComposable
 import com.sadellie.unitto.core.ui.unittoNavigation
-import com.sadellie.unitto.timezone.AddTimeZoneRoute
-import com.sadellie.unitto.timezone.TimeZoneRoute
+import com.sadellie.unitto.feature.timezone.AddTimeZoneRoute
+import com.sadellie.unitto.feature.timezone.TimeZoneRoute
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter