diff --git a/app/shared/src/commonMain/kotlin/club/nito/app/shared/NitoNavHost.kt b/app/shared/src/commonMain/kotlin/club/nito/app/shared/NitoNavHost.kt
index ce2b50b2..08d2af03 100644
--- a/app/shared/src/commonMain/kotlin/club/nito/app/shared/NitoNavHost.kt
+++ b/app/shared/src/commonMain/kotlin/club/nito/app/shared/NitoNavHost.kt
@@ -4,9 +4,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import club.nito.core.model.AuthStatus
-import club.nito.feature.auth.loginNavigationRoute
-import club.nito.feature.auth.loginScreen
-import club.nito.feature.auth.navigateToLogin
+import club.nito.feature.auth.login.loginNavigationRoute
+import club.nito.feature.auth.login.loginScreen
+import club.nito.feature.auth.login.navigateToLogin
 import club.nito.feature.schedule.detail.navigateToScheduleDetail
 import club.nito.feature.schedule.detail.scheduleDetailScreen
 import club.nito.feature.schedule.list.navigateToScheduleList
diff --git a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/di/AuthFeatureModule.kt b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/di/AuthFeatureModule.kt
index a3fcbc0a..c6e50946 100644
--- a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/di/AuthFeatureModule.kt
+++ b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/di/AuthFeatureModule.kt
@@ -1,6 +1,6 @@
 package club.nito.feature.auth.di
 
-import club.nito.feature.auth.LoginScreenStateMachine
+import club.nito.feature.auth.login.LoginScreenStateMachine
 import org.koin.core.module.Module
 import org.koin.dsl.module
 
diff --git a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginNavigation.kt b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginNavigation.kt
similarity index 94%
rename from feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginNavigation.kt
rename to feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginNavigation.kt
index 4513e738..aeb2f1ad 100644
--- a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginNavigation.kt
+++ b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginNavigation.kt
@@ -1,4 +1,4 @@
-package club.nito.feature.auth
+package club.nito.feature.auth.login
 
 import moe.tlaster.precompose.navigation.NavOptions
 import moe.tlaster.precompose.navigation.Navigator
diff --git a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreen.kt b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreen.kt
similarity index 99%
rename from feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreen.kt
rename to feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreen.kt
index 121a0588..2b32864d 100644
--- a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreen.kt
+++ b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreen.kt
@@ -1,4 +1,4 @@
-package club.nito.feature.auth
+package club.nito.feature.auth.login
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreenEvent.kt b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreenEvent.kt
similarity index 81%
rename from feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreenEvent.kt
rename to feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreenEvent.kt
index c518b4ed..c0f17578 100644
--- a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreenEvent.kt
+++ b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreenEvent.kt
@@ -1,4 +1,4 @@
-package club.nito.feature.auth
+package club.nito.feature.auth.login
 
 public sealed class LoginScreenEvent {
     public data object LoggedIn : LoginScreenEvent()
diff --git a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreenIntent.kt b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreenIntent.kt
similarity index 89%
rename from feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreenIntent.kt
rename to feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreenIntent.kt
index 5c901c3b..7fe94b65 100644
--- a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreenIntent.kt
+++ b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreenIntent.kt
@@ -1,4 +1,4 @@
-package club.nito.feature.auth
+package club.nito.feature.auth.login
 
 public sealed class LoginScreenIntent {
     public data class ChangeInputEmail(val email: String) : LoginScreenIntent()
diff --git a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreenStateMachine.kt b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreenStateMachine.kt
similarity index 98%
rename from feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreenStateMachine.kt
rename to feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreenStateMachine.kt
index 519245bc..d9f0fa03 100644
--- a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreenStateMachine.kt
+++ b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreenStateMachine.kt
@@ -1,4 +1,4 @@
-package club.nito.feature.auth
+package club.nito.feature.auth.login
 
 import club.nito.core.domain.AuthStatusStreamUseCase
 import club.nito.core.domain.LoginUseCase
diff --git a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreenUiState.kt b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreenUiState.kt
similarity index 86%
rename from feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreenUiState.kt
rename to feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreenUiState.kt
index 684749b9..1f8fa5f7 100644
--- a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreenUiState.kt
+++ b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/login/LoginScreenUiState.kt
@@ -1,4 +1,4 @@
-package club.nito.feature.auth
+package club.nito.feature.auth.login
 
 public data class LoginScreenUiState(
     val email: String,
diff --git a/feature/auth/src/iosMain/kotlin/club/nito/feature/auth/LoginScreen.ios.kt b/feature/auth/src/iosMain/kotlin/club/nito/feature/auth/login/LoginScreen.ios.kt
similarity index 93%
rename from feature/auth/src/iosMain/kotlin/club/nito/feature/auth/LoginScreen.ios.kt
rename to feature/auth/src/iosMain/kotlin/club/nito/feature/auth/login/LoginScreen.ios.kt
index f5569bb4..1d54cd88 100644
--- a/feature/auth/src/iosMain/kotlin/club/nito/feature/auth/LoginScreen.ios.kt
+++ b/feature/auth/src/iosMain/kotlin/club/nito/feature/auth/login/LoginScreen.ios.kt
@@ -1,4 +1,4 @@
-package club.nito.feature.auth
+package club.nito.feature.auth.login
 
 import androidx.compose.ui.window.ComposeUIViewController
 import club.nito.core.designsystem.theme.NitoTheme