diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f035ec6..2f70487 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -50,7 +50,6 @@ android {
         }
     }
 
-
     buildTypes {
         release {
             isMinifyEnabled = true
@@ -91,6 +90,7 @@ android {
 }
 
 dependencies {
+    implementation(project(":widget"))
     implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
     implementation("androidx.activity:activity-compose:1.8.2")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 96573c1..86c0796 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -87,7 +87,7 @@
         </service>
 
         <receiver
-            android:name=".WidgetReceiver"
+            android:name=".widget.WidgetReceiver"
             android:exported="false"
             android:label="@string/yellow_widget_name">
             <intent-filter>
diff --git a/app/src/main/java/com/no5ing/bbibbi/MainActivity.kt b/app/src/main/java/com/no5ing/bbibbi/MainActivity.kt
index 1b99eb3..1ea7c0b 100644
--- a/app/src/main/java/com/no5ing/bbibbi/MainActivity.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/MainActivity.kt
@@ -35,10 +35,10 @@ import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.datasource.network.request.member.AddFcmTokenRequest
 import com.no5ing.bbibbi.di.NetworkModule
 import com.no5ing.bbibbi.di.SessionModule
-import com.no5ing.bbibbi.presentation.ui.MainPage
+import com.no5ing.bbibbi.presentation.feature.MainPage
 import com.no5ing.bbibbi.presentation.ui.navigation.NavDestinationListener
-import com.no5ing.bbibbi.presentation.view_controller.LandingAlreadyFamilyExistsDestination
-import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.navigate
+import com.no5ing.bbibbi.presentation.feature.view_controller.LandingAlreadyFamilyExistsDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.navigate
 import com.no5ing.bbibbi.presentation.ui.theme.BbibbiTheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.util.LocalDeepLinkState
diff --git a/app/src/main/java/com/no5ing/bbibbi/data/model/widget/WidgetResult.kt b/app/src/main/java/com/no5ing/bbibbi/data/model/widget/WidgetResult.kt
deleted file mode 100644
index 6ab2071..0000000
--- a/app/src/main/java/com/no5ing/bbibbi/data/model/widget/WidgetResult.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.no5ing.bbibbi.data.model.widget
-
-import android.os.Parcelable
-import com.no5ing.bbibbi.data.model.BaseModel
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class WidgetResult(
-    val profileImageUrl: String?,
-    val postImageUrl: String,
-    val postContent: String,
-    val authorName: String,
-) : Parcelable, BaseModel()
\ No newline at end of file
diff --git a/app/src/main/java/com/no5ing/bbibbi/data/repository/post/GetCommentsRepository.kt b/app/src/main/java/com/no5ing/bbibbi/data/repository/post/GetCommentsRepository.kt
index 75f65c7..b4c52a7 100644
--- a/app/src/main/java/com/no5ing/bbibbi/data/repository/post/GetCommentsRepository.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/data/repository/post/GetCommentsRepository.kt
@@ -9,7 +9,7 @@ import com.no5ing.bbibbi.data.datasource.network.response.Pagination
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.data.repository.BasePageSource
 import com.no5ing.bbibbi.data.repository.BaseRepository
-import com.no5ing.bbibbi.presentation.uistate.post.PostCommentUiState
+import com.no5ing.bbibbi.presentation.feature.uistate.post.PostCommentUiState
 import com.no5ing.bbibbi.util.parallelMap
 import com.skydoves.sandwich.ApiResponse
 import com.skydoves.sandwich.mapSuccess
diff --git a/app/src/main/java/com/no5ing/bbibbi/data/repository/post/GetFeedsRepository.kt b/app/src/main/java/com/no5ing/bbibbi/data/repository/post/GetFeedsRepository.kt
index ad62380..4383fca 100644
--- a/app/src/main/java/com/no5ing/bbibbi/data/repository/post/GetFeedsRepository.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/data/repository/post/GetFeedsRepository.kt
@@ -10,7 +10,7 @@ import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.data.repository.BasePageSource
 import com.no5ing.bbibbi.data.repository.BaseRepository
-import com.no5ing.bbibbi.presentation.uistate.family.MainFeedUiState
+import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
 import com.no5ing.bbibbi.util.parallelMap
 import com.skydoves.sandwich.ApiResponse
 import com.skydoves.sandwich.mapSuccess
diff --git a/app/src/main/java/com/no5ing/bbibbi/di/SessionModule.kt b/app/src/main/java/com/no5ing/bbibbi/di/SessionModule.kt
index fbbcb6f..455347e 100644
--- a/app/src/main/java/com/no5ing/bbibbi/di/SessionModule.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/di/SessionModule.kt
@@ -3,7 +3,7 @@ package com.no5ing.bbibbi.di
 import android.content.Context
 import com.no5ing.bbibbi.data.model.auth.AuthResult
 import com.no5ing.bbibbi.data.model.member.Member
-import com.no5ing.bbibbi.presentation.uistate.common.SessionState
+import com.no5ing.bbibbi.presentation.feature.uistate.common.SessionState
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import timber.log.Timber
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/AddReactionBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/AddReactionBar.kt
similarity index 99%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/AddReactionBar.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/AddReactionBar.kt
index d5f37f5..99f7dc7 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/AddReactionBar.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/AddReactionBar.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.component
+package com.no5ing.bbibbi.presentation.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/BBiBBiSurface.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/BBiBBiSurface.kt
similarity index 90%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/BBiBBiSurface.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/BBiBBiSurface.kt
index a38440c..0f3f0c2 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/BBiBBiSurface.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/BBiBBiSurface.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.component
+package com.no5ing.bbibbi.presentation.component
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/util/BackToExitHandler.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/BackToExitHandler.kt
similarity index 89%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/util/BackToExitHandler.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/BackToExitHandler.kt
index b34e02b..2bdce95 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/util/BackToExitHandler.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/BackToExitHandler.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.util
+package com.no5ing.bbibbi.presentation.component
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
@@ -10,8 +10,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.stringResource
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
-import com.no5ing.bbibbi.presentation.ui.snackBarInfo
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/ClosableTopBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/ClosableTopBar.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/ClosableTopBar.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/ClosableTopBar.kt
index 33e623a..7fca32e 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/ClosableTopBar.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/ClosableTopBar.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.component
+package com.no5ing.bbibbi.presentation.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/CustomModalBottomSheet.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/CustomModalBottomSheet.kt
similarity index 99%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/CustomModalBottomSheet.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/CustomModalBottomSheet.kt
index 6a986df..5c29a5c 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/CustomModalBottomSheet.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/CustomModalBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.component
+package com.no5ing.bbibbi.presentation.component
 
 import android.content.Context
 import android.graphics.PixelFormat
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/DisposableTopBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/DisposableTopBar.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/DisposableTopBar.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/DisposableTopBar.kt
index dbcfc90..8a6a2d9 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/DisposableTopBar.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/DisposableTopBar.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.component
+package com.no5ing.bbibbi.presentation.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/DraggableCard.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/DraggableCard.kt
similarity index 98%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/DraggableCard.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/DraggableCard.kt
index a35f7ce..e831f40 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/DraggableCard.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/DraggableCard.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.component
+package com.no5ing.bbibbi.presentation.component
 
 import android.annotation.SuppressLint
 import androidx.compose.animation.core.MutableTransitionState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/Meatball.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/Meatball.kt
similarity index 95%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/Meatball.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/Meatball.kt
index ec4175f..97fb5ab 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/Meatball.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/Meatball.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.component
+package com.no5ing.bbibbi.presentation.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/OuterClickListener.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/OuterClickListener.kt
similarity index 91%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/OuterClickListener.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/OuterClickListener.kt
index 933d24d..8d32303 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/OuterClickListener.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/OuterClickListener.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.component
+package com.no5ing.bbibbi.presentation.component
 
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Box
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/ProfileImage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/ProfileImage.kt
similarity index 97%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/ProfileImage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/ProfileImage.kt
index 0e01609..9063291 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/ProfileImage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/ProfileImage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.component
+package com.no5ing.bbibbi.presentation.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/SheetDefaults.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/SheetDefaults.kt
similarity index 99%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/SheetDefaults.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/SheetDefaults.kt
index 9db8c49..5dc42d0 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/SheetDefaults.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/SheetDefaults.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.component
+package com.no5ing.bbibbi.presentation.component
 
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/SnackBarHost.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/SnackBarHost.kt
similarity index 98%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/SnackBarHost.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/SnackBarHost.kt
index ba81826..e405009 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/SnackBarHost.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/SnackBarHost.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui
+package com.no5ing.bbibbi.presentation.component
 
 
 import androidx.compose.foundation.background
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/SwipableV2.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/SwipableV2.kt
similarity index 99%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/SwipableV2.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/SwipableV2.kt
index 8188a70..86bf632 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/SwipableV2.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/SwipableV2.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.component
+package com.no5ing.bbibbi.presentation.component
 
 import androidx.compose.animation.core.AnimationSpec
 import androidx.compose.animation.core.SpringSpec
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/TextBubbleBox.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/TextBubbleBox.kt
similarity index 98%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/TextBubbleBox.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/TextBubbleBox.kt
index 5bf0472..de9ae55 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/component/TextBubbleBox.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/TextBubbleBox.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.component
+package com.no5ing.bbibbi.presentation.component
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.expandHorizontally
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/CTAButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/button/CTAButton.kt
similarity index 97%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/CTAButton.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/button/CTAButton.kt
index 4d55bd7..e7ea30a 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/CTAButton.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/button/CTAButton.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.button
+package com.no5ing.bbibbi.presentation.component.button
 
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.animateFloatAsState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/CameraCaptureButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/button/CameraCaptureButton.kt
similarity index 94%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/CameraCaptureButton.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/button/CameraCaptureButton.kt
index 09de687..4e012ef 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/CameraCaptureButton.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/button/CameraCaptureButton.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.button
+package com.no5ing.bbibbi.presentation.component.button
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/ToggleButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/button/ToggleButton.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/ToggleButton.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/component/button/ToggleButton.kt
index cc3e405..0083ab9 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/ToggleButton.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/component/button/ToggleButton.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.common.button
+package com.no5ing.bbibbi.presentation.component.button
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/MainPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/MainPage.kt
similarity index 87%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/MainPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/MainPage.kt
index e7baf92..58c7581 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/MainPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/MainPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui
+package com.no5ing.bbibbi.presentation.feature
 
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
@@ -16,9 +16,10 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.no5ing.bbibbi.presentation.ui.navigation.animation.defaultFadeIn
 import com.no5ing.bbibbi.presentation.ui.navigation.animation.defaultFadeOut
-import com.no5ing.bbibbi.presentation.view_controller.CameraViewDestination
-import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination
-import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.composable
+import com.no5ing.bbibbi.presentation.feature.view_controller.CameraViewDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.composable
+import com.no5ing.bbibbi.presentation.component.CustomSnackBarHost
 import com.no5ing.bbibbi.presentation.ui.navigation.graph.landingGraph
 import com.no5ing.bbibbi.presentation.ui.navigation.graph.mainGraph
 import com.no5ing.bbibbi.presentation.ui.navigation.graph.registerGraph
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/landing/join_family_with_link/JoinFamilyWithLinkState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/landing/join_family_with_link/JoinFamilyWithLinkState.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/landing/join_family_with_link/JoinFamilyWithLinkState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/landing/join_family_with_link/JoinFamilyWithLinkState.kt
index fd71243..4098d9f 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/landing/join_family_with_link/JoinFamilyWithLinkState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/landing/join_family_with_link/JoinFamilyWithLinkState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.state.landing.join_family_with_link
+package com.no5ing.bbibbi.presentation.feature.state.landing.join_family_with_link
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/landing/login/LoginPageState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/landing/login/LoginPageState.kt
similarity index 90%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/landing/login/LoginPageState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/landing/login/LoginPageState.kt
index 4c64de9..b6acdd7 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/landing/login/LoginPageState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/landing/login/LoginPageState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.state.landing.login
+package com.no5ing.bbibbi.presentation.feature.state.landing.login
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/landing/login/LoginStatus.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/landing/login/LoginStatus.kt
similarity index 79%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/landing/login/LoginStatus.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/landing/login/LoginStatus.kt
index 008f4ef..43cf190 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/landing/login/LoginStatus.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/landing/login/LoginStatus.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.state.landing.login
+package com.no5ing.bbibbi.presentation.feature.state.landing.login
 
 enum class LoginStatus {
     IDLE,
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/landing/onboarding/OnBoardingPageState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/landing/onboarding/OnBoardingPageState.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/landing/onboarding/OnBoardingPageState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/landing/onboarding/OnBoardingPageState.kt
index d471821..b165ac3 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/landing/onboarding/OnBoardingPageState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/landing/onboarding/OnBoardingPageState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.state.landing.onboarding
+package com.no5ing.bbibbi.presentation.feature.state.landing.onboarding
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.pager.PagerState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/main/family/FamilyPageInvitationState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/main/family/FamilyPageInvitationState.kt
similarity index 88%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/main/family/FamilyPageInvitationState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/main/family/FamilyPageInvitationState.kt
index 7372ad0..9139f3b 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/main/family/FamilyPageInvitationState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/main/family/FamilyPageInvitationState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.state.main.family
+package com.no5ing.bbibbi.presentation.feature.state.main.family
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/main/home/HomePageContentState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/main/home/HomePageContentState.kt
similarity index 85%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/main/home/HomePageContentState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/main/home/HomePageContentState.kt
index 9987272..21e8a0f 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/main/home/HomePageContentState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/main/home/HomePageContentState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.state.main.home
+package com.no5ing.bbibbi.presentation.feature.state.main.home
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
@@ -6,7 +6,7 @@ import androidx.compose.runtime.Stable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.paging.PagingData
-import com.no5ing.bbibbi.presentation.uistate.family.MainFeedUiState
+import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/main/home/HomePageState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/main/home/HomePageState.kt
similarity index 94%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/main/home/HomePageState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/main/home/HomePageState.kt
index 87dce63..4e80a81 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/main/home/HomePageState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/main/home/HomePageState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.state.main.home
+package com.no5ing.bbibbi.presentation.feature.state.main.home
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/main/home/HomePageStoryBarState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/main/home/HomePageStoryBarState.kt
similarity index 93%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/main/home/HomePageStoryBarState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/main/home/HomePageStoryBarState.kt
index 4b82ba5..e65b9c7 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/main/home/HomePageStoryBarState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/main/home/HomePageStoryBarState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.state.main.home
+package com.no5ing.bbibbi.presentation.feature.state.main.home
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/post/view/PostViewPageState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/post/view/PostViewPageState.kt
similarity index 81%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/post/view/PostViewPageState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/post/view/PostViewPageState.kt
index 43ed4d9..0b47eb3 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/post/view/PostViewPageState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/post/view/PostViewPageState.kt
@@ -1,10 +1,10 @@
-package com.no5ing.bbibbi.presentation.state.post.view
+package com.no5ing.bbibbi.presentation.feature.state.post.view
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.remember
 import com.no5ing.bbibbi.data.model.APIResponse
-import com.no5ing.bbibbi.presentation.uistate.family.MainFeedUiState
+import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/register/day_of_birth/RegisterDayOfBirthPageState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/register/day_of_birth/RegisterDayOfBirthPageState.kt
similarity index 95%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/register/day_of_birth/RegisterDayOfBirthPageState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/register/day_of_birth/RegisterDayOfBirthPageState.kt
index cef6fb7..8fa4999 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/register/day_of_birth/RegisterDayOfBirthPageState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/register/day_of_birth/RegisterDayOfBirthPageState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.state.register.day_of_birth
+package com.no5ing.bbibbi.presentation.feature.state.register.day_of_birth
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/register/nickname/RegisterNickNamePageState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/register/nickname/RegisterNickNamePageState.kt
similarity index 94%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/register/nickname/RegisterNickNamePageState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/register/nickname/RegisterNickNamePageState.kt
index cc38798..02f6f97 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/register/nickname/RegisterNickNamePageState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/register/nickname/RegisterNickNamePageState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.state.register.nickname
+package com.no5ing.bbibbi.presentation.feature.state.register.nickname
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/register/profile_image/RegisterProfileImagePageState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/register/profile_image/RegisterProfileImagePageState.kt
similarity index 91%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/register/profile_image/RegisterProfileImagePageState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/register/profile_image/RegisterProfileImagePageState.kt
index d40f527..a0988ad 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/register/profile_image/RegisterProfileImagePageState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/register/profile_image/RegisterProfileImagePageState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.state.register.profile_image
+package com.no5ing.bbibbi.presentation.feature.state.register.profile_image
 
 import android.net.Uri
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/setting/change_nickname/ChangeNicknamePageState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/setting/change_nickname/ChangeNicknamePageState.kt
similarity index 93%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/state/setting/change_nickname/ChangeNicknamePageState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/setting/change_nickname/ChangeNicknamePageState.kt
index 2d397e6..77001b8 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/setting/change_nickname/ChangeNicknamePageState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/state/setting/change_nickname/ChangeNicknamePageState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.state.setting.change_nickname
+package com.no5ing.bbibbi.presentation.feature.state.setting.change_nickname
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/uistate/common/SessionState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/common/SessionState.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/uistate/common/SessionState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/common/SessionState.kt
index dd6672d..b742ba7 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/uistate/common/SessionState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/common/SessionState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.uistate.common
+package com.no5ing.bbibbi.presentation.feature.uistate.common
 
 import com.no5ing.bbibbi.data.model.auth.AuthResult
 
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/family/FamilyInviteLinkUiState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/family/FamilyInviteLinkUiState.kt
new file mode 100644
index 0000000..12c6212
--- /dev/null
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/family/FamilyInviteLinkUiState.kt
@@ -0,0 +1,5 @@
+package com.no5ing.bbibbi.presentation.feature.uistate.family
+
+data class FamilyInviteLinkUiState(
+    val url: String
+)
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/uistate/family/MainFeedUiState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/family/MainFeedUiState.kt
similarity index 78%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/uistate/family/MainFeedUiState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/family/MainFeedUiState.kt
index cc1a8be..15de8bc 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/uistate/family/MainFeedUiState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/family/MainFeedUiState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.uistate.family
+package com.no5ing.bbibbi.presentation.feature.uistate.family
 
 import com.no5ing.bbibbi.data.model.BaseModel
 import com.no5ing.bbibbi.data.model.member.Member
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/uistate/post/PostCommentUiState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/post/PostCommentUiState.kt
similarity index 87%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/uistate/post/PostCommentUiState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/post/PostCommentUiState.kt
index 18012f6..94f17d4 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/uistate/post/PostCommentUiState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/post/PostCommentUiState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.uistate.post
+package com.no5ing.bbibbi.presentation.feature.uistate.post
 
 import android.os.Parcelable
 import com.no5ing.bbibbi.data.model.BaseModel
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/uistate/post/PostReactionUiState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/post/PostReactionUiState.kt
similarity index 95%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/uistate/post/PostReactionUiState.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/post/PostReactionUiState.kt
index 3fbe63a..a31b034 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/uistate/post/PostReactionUiState.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/uistate/post/PostReactionUiState.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.uistate.post
+package com.no5ing.bbibbi.presentation.feature.uistate.post
 
 import com.no5ing.bbibbi.data.model.BaseModel
 import com.no5ing.bbibbi.data.model.member.Member
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/common/CameraView.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/common/CameraView.kt
similarity index 97%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/common/CameraView.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/common/CameraView.kt
index 4296210..ff89189 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/common/CameraView.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/common/CameraView.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.common
+package com.no5ing.bbibbi.presentation.feature.view.common
 
 import android.net.Uri
 import android.util.Rational
@@ -49,9 +49,9 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.common.button.CameraCaptureButton
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.ClosableTopBar
+import com.no5ing.bbibbi.presentation.component.button.CameraCaptureButton
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.ClosableTopBar
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.util.getCameraProvider
 import com.no5ing.bbibbi.util.takePhotoWithImage
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/dialog/CustomAlertDialog.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/CustomAlertDialog.kt
similarity index 99%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/dialog/CustomAlertDialog.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/CustomAlertDialog.kt
index dbf8895..bbf927d 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/dialog/CustomAlertDialog.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/CustomAlertDialog.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.dialog
+package com.no5ing.bbibbi.presentation.feature.view.dialog
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/dialog/PostCommentDialog.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/PostCommentDialog.kt
similarity index 95%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/dialog/PostCommentDialog.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/PostCommentDialog.kt
index 11a4d52..0d0bca2 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/dialog/PostCommentDialog.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/PostCommentDialog.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.dialog
+package com.no5ing.bbibbi.presentation.feature.view.dialog
 
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -60,20 +60,20 @@ import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.ui.common.component.CircleProfileImage
-import com.no5ing.bbibbi.presentation.ui.common.component.DraggableCardComplex
-import com.no5ing.bbibbi.presentation.ui.common.component.ModalBottomSheet
-import com.no5ing.bbibbi.presentation.ui.common.component.rememberModalBottomSheetState
-import com.no5ing.bbibbi.presentation.view_controller.MainProfileDestination
-import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.navigate
-import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
-import com.no5ing.bbibbi.presentation.ui.snackBarWarning
+import com.no5ing.bbibbi.presentation.component.CircleProfileImage
+import com.no5ing.bbibbi.presentation.component.DraggableCardComplex
+import com.no5ing.bbibbi.presentation.component.ModalBottomSheet
+import com.no5ing.bbibbi.presentation.component.rememberModalBottomSheetState
+import com.no5ing.bbibbi.presentation.feature.view_controller.MainProfileDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.navigate
+import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
+import com.no5ing.bbibbi.presentation.component.snackBarWarning
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.uistate.post.PostCommentUiState
-import com.no5ing.bbibbi.presentation.viewmodel.post.CreatePostCommentViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.DeletePostCommentViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.PostCommentViewModel
+import com.no5ing.bbibbi.presentation.feature.uistate.post.PostCommentUiState
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.CreatePostCommentViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.DeletePostCommentViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.PostCommentViewModel
 import com.no5ing.bbibbi.util.LocalNavigateControllerState
 import com.no5ing.bbibbi.util.LocalSessionState
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/dialog/ReactionListDialog.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/ReactionListDialog.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/dialog/ReactionListDialog.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/ReactionListDialog.kt
index 44331c4..38c0c20 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/dialog/ReactionListDialog.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/ReactionListDialog.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.dialog
+package com.no5ing.bbibbi.presentation.feature.view.dialog
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.slideInVertically
@@ -58,14 +58,14 @@ import androidx.compose.ui.window.DialogWindowProvider
 import coil.compose.AsyncImage
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.member.Member
-import com.no5ing.bbibbi.presentation.ui.common.button.CTAButton
-import com.no5ing.bbibbi.presentation.ui.common.component.CircleProfileImage
-import com.no5ing.bbibbi.presentation.view_controller.MainProfileDestination
-import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.navigate
+import com.no5ing.bbibbi.presentation.component.button.CTAButton
+import com.no5ing.bbibbi.presentation.component.CircleProfileImage
+import com.no5ing.bbibbi.presentation.feature.view_controller.MainProfileDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.navigate
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.uistate.post.PostReactionUiState
-import com.no5ing.bbibbi.presentation.uistate.post.RealEmojiPostReactionUiState
+import com.no5ing.bbibbi.presentation.feature.uistate.post.PostReactionUiState
+import com.no5ing.bbibbi.presentation.feature.uistate.post.RealEmojiPostReactionUiState
 import com.no5ing.bbibbi.util.CustomDialogPosition
 import com.no5ing.bbibbi.util.LocalNavigateControllerState
 import com.no5ing.bbibbi.util.asyncImagePainter
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/already_family_exists/AlreadyFamilyExistsView.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/already_family_exists/AlreadyFamilyExistsView.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/already_family_exists/AlreadyFamilyExistsView.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/already_family_exists/AlreadyFamilyExistsView.kt
index 22347b4..3f6ca6c 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/already_family_exists/AlreadyFamilyExistsView.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/already_family_exists/AlreadyFamilyExistsView.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.landing.already_family_exists
+package com.no5ing.bbibbi.presentation.feature.view.landing.already_family_exists
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
@@ -18,8 +18,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.common.button.CTAButton
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.button.CTAButton
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
 
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/join_family/JoinFamilyPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPage.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/join_family/JoinFamilyPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPage.kt
index ba6859f..89066ff 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/join_family/JoinFamilyPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.landing.join_family
+package com.no5ing.bbibbi.presentation.feature.view.landing.join_family
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -31,14 +31,14 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.view.dialog.CustomAlertDialog
-import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
-import com.no5ing.bbibbi.presentation.ui.snackBarWarning
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.feature.view.dialog.CustomAlertDialog
+import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
+import com.no5ing.bbibbi.presentation.component.snackBarWarning
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.viewmodel.auth.RetrieveMeViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.family.CreateFamilyAndJoinViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.RetrieveMeViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.family.CreateFamilyAndJoinViewModel
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
 import com.no5ing.bbibbi.util.dashedBorder
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/join_family/JoinFamilyPageLinkBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPageLinkBar.kt
similarity index 97%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/join_family/JoinFamilyPageLinkBar.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPageLinkBar.kt
index 8dca75c..7499ebf 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/join_family/JoinFamilyPageLinkBar.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPageLinkBar.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.landing.join_family
+package com.no5ing.bbibbi.presentation.feature.view.landing.join_family
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/join_family_with_link/JoinFamilyWithLinkPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family_with_link/JoinFamilyWithLinkPage.kt
similarity index 93%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/join_family_with_link/JoinFamilyWithLinkPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family_with_link/JoinFamilyWithLinkPage.kt
index b23ff44..1bdb13a 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/join_family_with_link/JoinFamilyWithLinkPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family_with_link/JoinFamilyWithLinkPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.landing.join_family_with_link
+package com.no5ing.bbibbi.presentation.feature.view.landing.join_family_with_link
 
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -39,16 +39,16 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.state.landing.join_family_with_link.JoinFamilyWithLinkPageState
-import com.no5ing.bbibbi.presentation.state.landing.join_family_with_link.rememberJoinFamilyWithLinkPageState
-import com.no5ing.bbibbi.presentation.ui.common.button.CTAButton
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.DisposableTopBar
-import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
-import com.no5ing.bbibbi.presentation.ui.snackBarWarning
+import com.no5ing.bbibbi.presentation.feature.state.landing.join_family_with_link.JoinFamilyWithLinkPageState
+import com.no5ing.bbibbi.presentation.feature.state.landing.join_family_with_link.rememberJoinFamilyWithLinkPageState
+import com.no5ing.bbibbi.presentation.component.button.CTAButton
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.DisposableTopBar
+import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
+import com.no5ing.bbibbi.presentation.component.snackBarWarning
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.viewmodel.family.JoinFamilyWithLinkViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.family.JoinFamilyWithLinkViewModel
 import com.no5ing.bbibbi.util.LocalDeepLinkState
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/login/LoginPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/login/LoginPage.kt
similarity index 94%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/login/LoginPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/login/LoginPage.kt
index d5f23d3..55e65c6 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/login/LoginPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/login/LoginPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.landing.login
+package com.no5ing.bbibbi.presentation.feature.view.landing.login
 
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
@@ -38,14 +38,14 @@ import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.common.api.ApiException
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.state.landing.login.LoginPageState
-import com.no5ing.bbibbi.presentation.state.landing.login.LoginStatus
-import com.no5ing.bbibbi.presentation.state.landing.login.LoginSucceedResult
-import com.no5ing.bbibbi.presentation.state.landing.login.rememberLoginPageState
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.feature.state.landing.login.LoginPageState
+import com.no5ing.bbibbi.presentation.feature.state.landing.login.LoginStatus
+import com.no5ing.bbibbi.presentation.feature.state.landing.login.LoginSucceedResult
+import com.no5ing.bbibbi.presentation.feature.state.landing.login.rememberLoginPageState
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.util.BackToExitHandler
-import com.no5ing.bbibbi.presentation.viewmodel.auth.LoginWithCredentialsViewModel
+import com.no5ing.bbibbi.presentation.component.BackToExitHandler
+import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.LoginWithCredentialsViewModel
 import com.no5ing.bbibbi.util.googleSignInIntent
 import com.no5ing.bbibbi.util.kakaoSignIn
 import timber.log.Timber
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/onboarding/OnBoardingFirstPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingFirstPage.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/onboarding/OnBoardingFirstPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingFirstPage.kt
index d4bd330..b024ed5 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/onboarding/OnBoardingFirstPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingFirstPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.landing.onboarding
+package com.no5ing.bbibbi.presentation.feature.view.landing.onboarding
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/onboarding/OnBoardingPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingPage.kt
similarity index 91%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/onboarding/OnBoardingPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingPage.kt
index 7ee0e35..2a27f85 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/onboarding/OnBoardingPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.landing.onboarding
+package com.no5ing.bbibbi.presentation.feature.view.landing.onboarding
 
 import android.Manifest
 import android.os.Build
@@ -25,11 +25,11 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.state.landing.onboarding.OnBoardingPageState
-import com.no5ing.bbibbi.presentation.state.landing.onboarding.rememberOnBoardingPageState
-import com.no5ing.bbibbi.presentation.ui.common.button.CTAButton
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.MeatBall
+import com.no5ing.bbibbi.presentation.feature.state.landing.onboarding.OnBoardingPageState
+import com.no5ing.bbibbi.presentation.feature.state.landing.onboarding.rememberOnBoardingPageState
+import com.no5ing.bbibbi.presentation.component.button.CTAButton
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.MeatBall
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 import com.no5ing.bbibbi.util.LocalSessionState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/onboarding/OnBoardingSecondPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingSecondPage.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/onboarding/OnBoardingSecondPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingSecondPage.kt
index 8f0876a..6e3c3a9 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/onboarding/OnBoardingSecondPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingSecondPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.landing.onboarding
+package com.no5ing.bbibbi.presentation.feature.view.landing.onboarding
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/onboarding/OnBoardingThirdPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingThirdPage.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/onboarding/OnBoardingThirdPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingThirdPage.kt
index 0be8639..3f227e9 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/landing/onboarding/OnBoardingThirdPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingThirdPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.landing.onboarding
+package com.no5ing.bbibbi.presentation.feature.view.landing.onboarding
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/calendar/MainCalendarDay.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarDay.kt
similarity index 98%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/calendar/MainCalendarDay.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarDay.kt
index 3298f0c..72c43cd 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/calendar/MainCalendarDay.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarDay.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.calendar
+package com.no5ing.bbibbi.presentation.feature.view.main.calendar
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/calendar/MainCalendarPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarPage.kt
similarity index 97%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/calendar/MainCalendarPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarPage.kt
index 3b5795c..6cd9587 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/calendar/MainCalendarPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.calendar
+package com.no5ing.bbibbi.presentation.feature.view.main.calendar
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
@@ -37,12 +37,12 @@ import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.post.CalendarBanner
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.DisposableTopBar
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.DisposableTopBar
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.viewmodel.post.CalendarMonthViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.MonthlyStatisticsViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.CalendarMonthViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.MonthlyStatisticsViewModel
 import com.no5ing.bbibbi.util.getScreenSize
 import com.skydoves.balloon.ArrowPositionRules
 import com.skydoves.balloon.BalloonAnimation
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/calendar/detail/CalendarDetailPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/detail/CalendarDetailPage.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/calendar/detail/CalendarDetailPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/detail/CalendarDetailPage.kt
index dc2e878..7cfad90 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/calendar/detail/CalendarDetailPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/detail/CalendarDetailPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.calendar.detail
+package com.no5ing.bbibbi.presentation.feature.view.main.calendar.detail
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
@@ -43,21 +43,21 @@ import com.airbnb.lottie.compose.rememberLottieComposition
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.CircleProfileImage
-import com.no5ing.bbibbi.presentation.ui.common.component.DisposableTopBar
-import com.no5ing.bbibbi.presentation.view.main.calendar.MainCalendarDay
-import com.no5ing.bbibbi.presentation.view.post.view.PostViewContent
-import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
-import com.no5ing.bbibbi.presentation.ui.snackBarFire
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.CircleProfileImage
+import com.no5ing.bbibbi.presentation.component.DisposableTopBar
+import com.no5ing.bbibbi.presentation.feature.view.main.calendar.MainCalendarDay
+import com.no5ing.bbibbi.presentation.feature.view.post.view.PostViewContent
+import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
+import com.no5ing.bbibbi.presentation.component.snackBarFire
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.uistate.family.MainFeedUiState
-import com.no5ing.bbibbi.presentation.viewmodel.post.AddPostReactionViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.CalendarWeekViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.FamilySwipePostsViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.PostReactionBarViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.RemovePostReactionViewModel
+import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.AddPostReactionViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.CalendarWeekViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.FamilySwipePostsViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.PostReactionBarViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.RemovePostReactionViewModel
 import com.no5ing.bbibbi.util.LocalSessionState
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
 import com.no5ing.bbibbi.util.asyncImagePainter
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/family/FamilyPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPage.kt
similarity index 95%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/family/FamilyPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPage.kt
index 8154ff1..14d0ee2 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/family/FamilyPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.family
+package com.no5ing.bbibbi.presentation.feature.view.main.family
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
@@ -39,13 +39,13 @@ import androidx.paging.compose.collectAsLazyPagingItems
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.CircleProfileImage
-import com.no5ing.bbibbi.presentation.ui.common.component.DisposableTopBar
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.CircleProfileImage
+import com.no5ing.bbibbi.presentation.component.DisposableTopBar
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.viewmodel.auth.RetrieveMeViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.members.FamilyMembersViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.RetrieveMeViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.members.FamilyMembersViewModel
 import com.no5ing.bbibbi.util.LocalSessionState
 
 @OptIn(ExperimentalMaterialApi::class)
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/family/FamilyPageInviteButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPageInviteButton.kt
similarity index 93%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/family/FamilyPageInviteButton.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPageInviteButton.kt
index 6f15743..82cbaa5 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/family/FamilyPageInviteButton.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPageInviteButton.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.family
+package com.no5ing.bbibbi.presentation.feature.view.main.family
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -30,10 +30,10 @@ import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.state.main.family.FamilyPageInvitationState
-import com.no5ing.bbibbi.presentation.state.main.family.rememberFamilyPageInvitationState
+import com.no5ing.bbibbi.presentation.feature.state.main.family.FamilyPageInvitationState
+import com.no5ing.bbibbi.presentation.feature.state.main.family.rememberFamilyPageInvitationState
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.viewmodel.family.FamilyInviteLinkViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.family.FamilyInviteLinkViewModel
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 import com.no5ing.bbibbi.util.LocalSessionState
 
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePage.kt
similarity index 81%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePage.kt
index 032b498..1914d1c 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.home
+package com.no5ing.bbibbi.presentation.feature.view.main.home
 
 import android.net.Uri
 import androidx.compose.foundation.background
@@ -21,22 +21,22 @@ import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.model.post.Post
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.state.main.home.HomePageContentState
-import com.no5ing.bbibbi.presentation.state.main.home.HomePageState
-import com.no5ing.bbibbi.presentation.state.main.home.HomePageStoryBarState
-import com.no5ing.bbibbi.presentation.state.main.home.rememberHomePageContentState
-import com.no5ing.bbibbi.presentation.state.main.home.rememberHomePageState
-import com.no5ing.bbibbi.presentation.state.main.home.rememberHomePageStoryBarState
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.view.dialog.CustomAlertDialog
+import com.no5ing.bbibbi.presentation.feature.state.main.home.HomePageContentState
+import com.no5ing.bbibbi.presentation.feature.state.main.home.HomePageState
+import com.no5ing.bbibbi.presentation.feature.state.main.home.HomePageStoryBarState
+import com.no5ing.bbibbi.presentation.feature.state.main.home.rememberHomePageContentState
+import com.no5ing.bbibbi.presentation.feature.state.main.home.rememberHomePageState
+import com.no5ing.bbibbi.presentation.feature.state.main.home.rememberHomePageStoryBarState
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.feature.view.dialog.CustomAlertDialog
 import com.no5ing.bbibbi.presentation.ui.theme.BbibbiTheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.util.BackToExitHandler
-import com.no5ing.bbibbi.presentation.viewmodel.auth.RetrieveMeViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.members.FamilyMembersViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.DailyFamilyTopViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.IsMeUploadedTodayViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.MainPostFeedViewModel
+import com.no5ing.bbibbi.presentation.component.BackToExitHandler
+import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.RetrieveMeViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.members.FamilyMembersViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.DailyFamilyTopViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.IsMeUploadedTodayViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.MainPostFeedViewModel
 import com.no5ing.bbibbi.util.LocalSessionState
 
 @Composable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageContent.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageContent.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageContent.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageContent.kt
index f0ac008..2975214 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageContent.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageContent.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.home
+package com.no5ing.bbibbi.presentation.feature.view.main.home
 
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -48,16 +48,16 @@ import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.model.post.Post
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.state.main.home.HomePageContentState
-import com.no5ing.bbibbi.presentation.state.main.home.HomePageStoryBarState
-import com.no5ing.bbibbi.presentation.state.main.home.rememberHomePageContentState
-import com.no5ing.bbibbi.presentation.state.main.home.rememberHomePageStoryBarState
+import com.no5ing.bbibbi.presentation.feature.state.main.home.HomePageContentState
+import com.no5ing.bbibbi.presentation.feature.state.main.home.HomePageStoryBarState
+import com.no5ing.bbibbi.presentation.feature.state.main.home.rememberHomePageContentState
+import com.no5ing.bbibbi.presentation.feature.state.main.home.rememberHomePageStoryBarState
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.viewmodel.auth.RetrieveMeViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.members.FamilyMembersViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.DailyFamilyTopViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.MainPostFeedViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.RetrieveMeViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.members.FamilyMembersViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.DailyFamilyTopViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.MainPostFeedViewModel
 import com.no5ing.bbibbi.util.asyncImagePainter
 import com.no5ing.bbibbi.util.gapBetweenNow
 import com.no5ing.bbibbi.util.todayAsString
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageNoFamilyBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageNoFamilyBar.kt
similarity index 98%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageNoFamilyBar.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageNoFamilyBar.kt
index 15896bc..a8e8273 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageNoFamilyBar.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageNoFamilyBar.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.home
+package com.no5ing.bbibbi.presentation.feature.view.main.home
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageStoryBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageStoryBar.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageStoryBar.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageStoryBar.kt
index 2543995..2b71b96 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageStoryBar.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageStoryBar.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.home
+package com.no5ing.bbibbi.presentation.feature.view.main.home
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -32,9 +32,9 @@ import androidx.compose.ui.unit.dp
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.member.Member
-import com.no5ing.bbibbi.presentation.state.main.home.HomePageStoryBarState
-import com.no5ing.bbibbi.presentation.state.main.home.rememberHomePageStoryBarState
-import com.no5ing.bbibbi.presentation.ui.common.component.CircleProfileImage
+import com.no5ing.bbibbi.presentation.feature.state.main.home.HomePageStoryBarState
+import com.no5ing.bbibbi.presentation.feature.state.main.home.rememberHomePageStoryBarState
+import com.no5ing.bbibbi.presentation.component.CircleProfileImage
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
 import com.no5ing.bbibbi.util.LocalSessionState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageTopBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageTopBar.kt
similarity index 97%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageTopBar.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageTopBar.kt
index ef92bb3..96f6c06 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageTopBar.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageTopBar.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.home
+package com.no5ing.bbibbi.presentation.feature.view.main.home
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageUploadButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageUploadButton.kt
similarity index 97%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageUploadButton.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageUploadButton.kt
index c2eeb65..fe5a176 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/HomePageUploadButton.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageUploadButton.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.home
+package com.no5ing.bbibbi.presentation.feature.view.main.home
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
@@ -31,7 +31,7 @@ import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.common.button.CameraCaptureButton
+import com.no5ing.bbibbi.presentation.component.button.CameraCaptureButton
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
 
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/UploadCountDownBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/UploadCountDownBar.kt
similarity index 98%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/UploadCountDownBar.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/UploadCountDownBar.kt
index fe33a3e..4a33b62 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/home/UploadCountDownBar.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/UploadCountDownBar.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.home
+package com.no5ing.bbibbi.presentation.feature.view.main.home
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/profile/ProfilePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePage.kt
similarity index 90%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/profile/ProfilePage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePage.kt
index 8f8d76c..35baf43 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/profile/ProfilePage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.profile
+package com.no5ing.bbibbi.presentation.feature.view.main.profile
 
 import android.net.Uri
 import androidx.compose.foundation.clickable
@@ -26,11 +26,11 @@ import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.model.post.Post
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.DisposableTopBar
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.DisposableTopBar
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.viewmodel.members.ChangeProfileImageViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.members.FamilyMemberViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.members.ChangeProfileImageViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.members.FamilyMemberViewModel
 import com.no5ing.bbibbi.util.LocalSessionState
 
 @Composable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/profile/ProfilePageContent.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageContent.kt
similarity index 98%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/profile/ProfilePageContent.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageContent.kt
index ea91ccc..8093b6b 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/profile/ProfilePageContent.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageContent.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.profile
+package com.no5ing.bbibbi.presentation.feature.view.main.profile
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
@@ -43,7 +43,7 @@ import com.no5ing.bbibbi.data.model.post.Post
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.viewmodel.post.FamilyPostsViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.FamilyPostsViewModel
 import com.no5ing.bbibbi.util.asyncImagePainter
 import com.no5ing.bbibbi.util.toLocalizedDate
 
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/profile/ProfilePageMemberBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageMemberBar.kt
similarity index 93%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/main/profile/ProfilePageMemberBar.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageMemberBar.kt
index 8d10a51..49b5618 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/main/profile/ProfilePageMemberBar.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageMemberBar.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.main.profile
+package com.no5ing.bbibbi.presentation.feature.view.main.profile
 
 import android.net.Uri
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -38,14 +38,14 @@ import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.ui.common.component.CircleProfileImage
-import com.no5ing.bbibbi.presentation.view.dialog.AlbumCameraSelectDialog
-import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
-import com.no5ing.bbibbi.presentation.ui.snackBarInfo
-import com.no5ing.bbibbi.presentation.ui.snackBarWarning
+import com.no5ing.bbibbi.presentation.component.CircleProfileImage
+import com.no5ing.bbibbi.presentation.feature.view.dialog.AlbumCameraSelectDialog
+import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
+import com.no5ing.bbibbi.presentation.component.snackBarInfo
+import com.no5ing.bbibbi.presentation.component.snackBarWarning
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.viewmodel.members.ChangeProfileImageViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.members.FamilyMemberViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.members.ChangeProfileImageViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.members.FamilyMemberViewModel
 import com.no5ing.bbibbi.util.LocalSessionState
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
 import com.no5ing.bbibbi.util.getErrorMessage
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/create_real_emoji/CreateRealEmojiPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/create_real_emoji/CreateRealEmojiPage.kt
similarity index 95%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/post/create_real_emoji/CreateRealEmojiPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/create_real_emoji/CreateRealEmojiPage.kt
index 47ff2d3..f9ce962 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/create_real_emoji/CreateRealEmojiPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/create_real_emoji/CreateRealEmojiPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.post.create_real_emoji
+package com.no5ing.bbibbi.presentation.feature.view.post.create_real_emoji
 
 import android.util.Rational
 import android.view.Surface.ROTATION_0
@@ -46,6 +46,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.ClipOp
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.drawscope.clipPath
 import androidx.compose.ui.layout.ContentScale
@@ -63,15 +64,15 @@ import com.google.accompanist.permissions.rememberPermissionState
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.ui.common.button.CameraCaptureButton
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.ClosableTopBar
-import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
-import com.no5ing.bbibbi.presentation.ui.snackBarWarning
+import com.no5ing.bbibbi.presentation.component.button.CameraCaptureButton
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.ClosableTopBar
+import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
+import com.no5ing.bbibbi.presentation.component.snackBarWarning
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.viewmodel.post.MemberRealEmojiListViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.UpdateMemberPostRealEmojiViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.MemberRealEmojiListViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.UpdateMemberPostRealEmojiViewModel
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
 import com.no5ing.bbibbi.util.asyncImagePainter
 import com.no5ing.bbibbi.util.emojiList
@@ -260,7 +261,7 @@ fun CreateRealEmojiPage(
                         .fillMaxWidth()
                         .clip(RoundedCornerShape(48.dp))
                 ) {
-                    val circlePath = androidx.compose.ui.graphics.Path().apply {
+                    val circlePath = Path().apply {
                         addOval(Rect(center, size.minDimension / 2))
                     }
                     clipPath(circlePath, clipOp = ClipOp.Difference) {
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/upload/PostUploadPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/upload/PostUploadPage.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/post/upload/PostUploadPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/upload/PostUploadPage.kt
index 0c795ad..9165f87 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/upload/PostUploadPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/upload/PostUploadPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.post.upload
+package com.no5ing.bbibbi.presentation.feature.view.post.upload
 
 import android.graphics.ImageDecoder
 import android.net.Uri
@@ -60,16 +60,16 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import coil.compose.rememberAsyncImagePainter
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.ui.common.button.CTAButton
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.DisposableTopBar
-import com.no5ing.bbibbi.presentation.ui.common.component.TextBubbleBox
-import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
-import com.no5ing.bbibbi.presentation.ui.snackBarCamera
-import com.no5ing.bbibbi.presentation.ui.snackBarWarning
+import com.no5ing.bbibbi.presentation.component.button.CTAButton
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.DisposableTopBar
+import com.no5ing.bbibbi.presentation.component.TextBubbleBox
+import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
+import com.no5ing.bbibbi.presentation.component.snackBarCamera
+import com.no5ing.bbibbi.presentation.component.snackBarWarning
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.viewmodel.post.CreatePostViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.CreatePostViewModel
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
 import com.no5ing.bbibbi.util.codePointLength
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostCommentBoxIcon.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostCommentBoxIcon.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostCommentBoxIcon.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostCommentBoxIcon.kt
index 5ff0b78..0f70ae7 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostCommentBoxIcon.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostCommentBoxIcon.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.post.view
+package com.no5ing.bbibbi.presentation.feature.view.post.view
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewContent.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewContent.kt
similarity index 91%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewContent.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewContent.kt
index ec349c8..af2b0d9 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewContent.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewContent.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.post.view
+package com.no5ing.bbibbi.presentation.feature.view.post.view
 
 
 import androidx.compose.animation.core.tween
@@ -28,13 +28,13 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import coil.compose.AsyncImage
 import com.no5ing.bbibbi.data.model.post.Post
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.ui.common.component.AddReactionBar
-import com.no5ing.bbibbi.presentation.ui.common.component.MiniTextBubbleBox
-import com.no5ing.bbibbi.presentation.viewmodel.post.AddPostReactionViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.AddRealEmojiViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.MemberRealEmojiListViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.PostReactionBarViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.RemovePostReactionViewModel
+import com.no5ing.bbibbi.presentation.component.AddReactionBar
+import com.no5ing.bbibbi.presentation.component.MiniTextBubbleBox
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.AddPostReactionViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.AddRealEmojiViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.MemberRealEmojiListViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.PostReactionBarViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.RemovePostReactionViewModel
 import com.no5ing.bbibbi.util.LocalSessionState
 import com.no5ing.bbibbi.util.asyncImagePainter
 
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewEmojiElement.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewEmojiElement.kt
similarity index 97%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewEmojiElement.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewEmojiElement.kt
index 19691ec..3a645c1 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewEmojiElement.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewEmojiElement.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.post.view
+package com.no5ing.bbibbi.presentation.feature.view.post.view
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewPage.kt
similarity index 91%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewPage.kt
index c50a8ec..370a800 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.post.view
+package com.no5ing.bbibbi.presentation.feature.view.post.view
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
@@ -40,18 +40,18 @@ import coil.compose.AsyncImage
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.state.post.view.PostViewPageState
-import com.no5ing.bbibbi.presentation.state.post.view.rememberPostViewPageState
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.CircleProfileImage
+import com.no5ing.bbibbi.presentation.feature.state.post.view.PostViewPageState
+import com.no5ing.bbibbi.presentation.feature.state.post.view.rememberPostViewPageState
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.CircleProfileImage
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.uistate.family.MainFeedUiState
-import com.no5ing.bbibbi.presentation.viewmodel.post.AddPostReactionViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.FamilyPostViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.FamilySwipePostsViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.PostReactionBarViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.RemovePostReactionViewModel
+import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.AddPostReactionViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.FamilyPostViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.FamilySwipePostsViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.PostReactionBarViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.RemovePostReactionViewModel
 import com.no5ing.bbibbi.util.LocalSessionState
 import com.no5ing.bbibbi.util.asyncImagePainter
 import com.no5ing.bbibbi.util.toLocalizedDate
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewReactionBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewReactionBar.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewReactionBar.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewReactionBar.kt
index 4252100..4d9afab 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewReactionBar.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewReactionBar.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.post.view
+package com.no5ing.bbibbi.presentation.feature.view.post.view
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -28,16 +28,16 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.post.Post
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.view.dialog.PostCommentDialog
-import com.no5ing.bbibbi.presentation.view.dialog.ReactionListDialog
+import com.no5ing.bbibbi.presentation.feature.view.dialog.PostCommentDialog
+import com.no5ing.bbibbi.presentation.feature.view.dialog.ReactionListDialog
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.uistate.post.PostReactionUiState
-import com.no5ing.bbibbi.presentation.uistate.post.RealEmojiPostReactionUiState
-import com.no5ing.bbibbi.presentation.viewmodel.post.AddPostReactionViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.AddRealEmojiViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.PostReactionBarViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.RemovePostReactionViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.post.RemoveRealEmojiViewModel
+import com.no5ing.bbibbi.presentation.feature.uistate.post.PostReactionUiState
+import com.no5ing.bbibbi.presentation.feature.uistate.post.RealEmojiPostReactionUiState
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.AddPostReactionViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.AddRealEmojiViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.PostReactionBarViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.RemovePostReactionViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.post.RemoveRealEmojiViewModel
 import com.no5ing.bbibbi.util.LocalSessionState
 
 @OptIn(ExperimentalLayoutApi::class)
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewRealEmojiElement.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewRealEmojiElement.kt
similarity index 98%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewRealEmojiElement.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewRealEmojiElement.kt
index a757ec3..bdf7b15 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/post/view/PostViewRealEmojiElement.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewRealEmojiElement.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.post.view
+package com.no5ing.bbibbi.presentation.feature.view.post.view
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/register/day_of_birth/RegisterDayOfBirthPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/day_of_birth/RegisterDayOfBirthPage.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/register/day_of_birth/RegisterDayOfBirthPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/day_of_birth/RegisterDayOfBirthPage.kt
index 6632d7f..969e51d 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/register/day_of_birth/RegisterDayOfBirthPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/day_of_birth/RegisterDayOfBirthPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.register.day_of_birth
+package com.no5ing.bbibbi.presentation.feature.view.register.day_of_birth
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -37,10 +37,10 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.state.register.day_of_birth.RegisterDayOfBirthPageState
-import com.no5ing.bbibbi.presentation.state.register.day_of_birth.rememberRegisterDayOfBirthPageState
-import com.no5ing.bbibbi.presentation.ui.common.button.CTAButton
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.feature.state.register.day_of_birth.RegisterDayOfBirthPageState
+import com.no5ing.bbibbi.presentation.feature.state.register.day_of_birth.rememberRegisterDayOfBirthPageState
+import com.no5ing.bbibbi.presentation.component.button.CTAButton
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
 import java.time.YearMonth
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/register/nickname/RegisterNickNamePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/nickname/RegisterNickNamePage.kt
similarity index 95%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/register/nickname/RegisterNickNamePage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/nickname/RegisterNickNamePage.kt
index 71febe2..62f7f79 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/register/nickname/RegisterNickNamePage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/nickname/RegisterNickNamePage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.register.nickname
+package com.no5ing.bbibbi.presentation.feature.view.register.nickname
 
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -36,10 +36,10 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.state.register.nickname.RegisterNickNamePageState
-import com.no5ing.bbibbi.presentation.state.register.nickname.rememberRegisterNickNamePageState
-import com.no5ing.bbibbi.presentation.ui.common.button.CTAButton
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.feature.state.register.nickname.RegisterNickNamePageState
+import com.no5ing.bbibbi.presentation.feature.state.register.nickname.rememberRegisterNickNamePageState
+import com.no5ing.bbibbi.presentation.component.button.CTAButton
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
 
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/register/profile_image/RegisterProfileImagePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/profile_image/RegisterProfileImagePage.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/register/profile_image/RegisterProfileImagePage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/profile_image/RegisterProfileImagePage.kt
index eb0d53c..82e49c7 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/register/profile_image/RegisterProfileImagePage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/profile_image/RegisterProfileImagePage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.register.profile_image
+package com.no5ing.bbibbi.presentation.feature.view.register.profile_image
 
 
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -42,16 +42,16 @@ import coil.compose.rememberAsyncImagePainter
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.state.register.profile_image.RegisterProfileImagePageState
-import com.no5ing.bbibbi.presentation.state.register.profile_image.rememberRegisterProfileImagePageState
-import com.no5ing.bbibbi.presentation.ui.common.button.CTAButton
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.view.dialog.AlbumCameraSelectDialog
-import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
-import com.no5ing.bbibbi.presentation.ui.snackBarWarning
+import com.no5ing.bbibbi.presentation.feature.state.register.profile_image.RegisterProfileImagePageState
+import com.no5ing.bbibbi.presentation.feature.state.register.profile_image.rememberRegisterProfileImagePageState
+import com.no5ing.bbibbi.presentation.component.button.CTAButton
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.feature.view.dialog.AlbumCameraSelectDialog
+import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
+import com.no5ing.bbibbi.presentation.component.snackBarWarning
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.viewmodel.auth.RegisterMemberViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.RegisterMemberViewModel
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
 import com.no5ing.bbibbi.util.getErrorMessage
 import com.no5ing.bbibbi.util.localResources
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/setting/change_nickname/ChangeNicknamePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/change_nickname/ChangeNicknamePage.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/setting/change_nickname/ChangeNicknamePage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/change_nickname/ChangeNicknamePage.kt
index fff1ec1..6cc0e13 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/setting/change_nickname/ChangeNicknamePage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/change_nickname/ChangeNicknamePage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.setting.change_nickname
+package com.no5ing.bbibbi.presentation.feature.view.setting.change_nickname
 
 
 import androidx.compose.foundation.layout.Arrangement
@@ -38,17 +38,17 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.state.setting.change_nickname.ChangeNicknamePageState
-import com.no5ing.bbibbi.presentation.state.setting.change_nickname.rememberChangeNicknamePageState
-import com.no5ing.bbibbi.presentation.ui.common.button.CTAButton
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.DisposableTopBar
-import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
-import com.no5ing.bbibbi.presentation.ui.snackBarSuccess
-import com.no5ing.bbibbi.presentation.ui.snackBarWarning
+import com.no5ing.bbibbi.presentation.feature.state.setting.change_nickname.ChangeNicknamePageState
+import com.no5ing.bbibbi.presentation.feature.state.setting.change_nickname.rememberChangeNicknamePageState
+import com.no5ing.bbibbi.presentation.component.button.CTAButton
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.DisposableTopBar
+import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
+import com.no5ing.bbibbi.presentation.component.snackBarSuccess
+import com.no5ing.bbibbi.presentation.component.snackBarWarning
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.viewmodel.members.ChangeNicknameViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.members.ChangeNicknameViewModel
 import com.no5ing.bbibbi.util.LocalSessionState
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
 import com.no5ing.bbibbi.util.getErrorMessage
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/setting/home/SettingHomePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/home/SettingHomePage.kt
similarity index 94%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/setting/home/SettingHomePage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/home/SettingHomePage.kt
index dc6bdab..017ea0b 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/setting/home/SettingHomePage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/home/SettingHomePage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.setting.home
+package com.no5ing.bbibbi.presentation.feature.view.setting.home
 
 import android.Manifest
 import android.content.Intent
@@ -39,17 +39,17 @@ import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.OperationStatus
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.DisposableTopBar
-import com.no5ing.bbibbi.presentation.view.dialog.CustomAlertDialog
-import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
-import com.no5ing.bbibbi.presentation.ui.snackBarInfo
-import com.no5ing.bbibbi.presentation.ui.snackBarWarning
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.DisposableTopBar
+import com.no5ing.bbibbi.presentation.feature.view.dialog.CustomAlertDialog
+import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
+import com.no5ing.bbibbi.presentation.component.snackBarInfo
+import com.no5ing.bbibbi.presentation.component.snackBarWarning
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.viewmodel.auth.LogoutViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.auth.RetrieveAppVersionViewModel
-import com.no5ing.bbibbi.presentation.viewmodel.family.QuitFamilyViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.LogoutViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.RetrieveAppVersionViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.family.QuitFamilyViewModel
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
 import com.no5ing.bbibbi.util.emptyPermissionState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/setting/quit/QuitPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/quit/QuitPage.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/setting/quit/QuitPage.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/quit/QuitPage.kt
index 1080aea..b604efc 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/setting/quit/QuitPage.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/quit/QuitPage.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.setting.quit
+package com.no5ing.bbibbi.presentation.feature.view.setting.quit
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -29,16 +29,16 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.ui.common.button.CTAButton
-import com.no5ing.bbibbi.presentation.ui.common.button.ToggleButton
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.common.component.DisposableTopBar
-import com.no5ing.bbibbi.presentation.view.dialog.CustomAlertDialog
-import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
-import com.no5ing.bbibbi.presentation.ui.snackBarWarning
+import com.no5ing.bbibbi.presentation.component.button.CTAButton
+import com.no5ing.bbibbi.presentation.component.button.ToggleButton
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.DisposableTopBar
+import com.no5ing.bbibbi.presentation.feature.view.dialog.CustomAlertDialog
+import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
+import com.no5ing.bbibbi.presentation.component.snackBarWarning
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.viewmodel.auth.QuitViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.QuitViewModel
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
 import com.no5ing.bbibbi.util.getErrorMessage
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view/setting/webview/WebViewDialog.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/webview/WebViewDialog.kt
similarity index 93%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view/setting/webview/WebViewDialog.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/webview/WebViewDialog.kt
index af02c8a..4446250 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view/setting/webview/WebViewDialog.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/webview/WebViewDialog.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view.setting.webview
+package com.no5ing.bbibbi.presentation.feature.view.setting.webview
 
 import android.webkit.JavascriptInterface
 import android.webkit.WebView
@@ -10,7 +10,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.viewinterop.AndroidView
-import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
+import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
 import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
 import kotlinx.coroutines.launch
 
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/CommonViewDestination.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/CommonViewDestination.kt
similarity index 84%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/CommonViewDestination.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/CommonViewDestination.kt
index d8138bd..934c0a2 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/CommonViewDestination.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/CommonViewDestination.kt
@@ -1,9 +1,9 @@
-package com.no5ing.bbibbi.presentation.view_controller
+package com.no5ing.bbibbi.presentation.feature.view_controller
 
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
-import com.no5ing.bbibbi.presentation.view.common.CameraView
+import com.no5ing.bbibbi.presentation.feature.view.common.CameraView
 
 object CameraViewDestination : NavigationDestination(
     route = cameraViewRoute,
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/LandingDestination.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/LandingDestination.kt
similarity index 83%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/LandingDestination.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/LandingDestination.kt
index 72ac342..af6e35e 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/LandingDestination.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/LandingDestination.kt
@@ -1,14 +1,14 @@
-package com.no5ing.bbibbi.presentation.view_controller
+package com.no5ing.bbibbi.presentation.feature.view_controller
 
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
-import com.no5ing.bbibbi.presentation.state.landing.login.LoginSucceedResult
-import com.no5ing.bbibbi.presentation.view.landing.already_family_exists.AlreadyFamilyExistsView
-import com.no5ing.bbibbi.presentation.view.landing.join_family.JoinFamilyPage
-import com.no5ing.bbibbi.presentation.view.landing.join_family_with_link.JoinFamilyWithLinkPage
-import com.no5ing.bbibbi.presentation.view.landing.login.LoginPage
-import com.no5ing.bbibbi.presentation.view.landing.onboarding.OnBoardingPage
+import com.no5ing.bbibbi.presentation.feature.state.landing.login.LoginSucceedResult
+import com.no5ing.bbibbi.presentation.feature.view.landing.already_family_exists.AlreadyFamilyExistsView
+import com.no5ing.bbibbi.presentation.feature.view.landing.join_family.JoinFamilyPage
+import com.no5ing.bbibbi.presentation.feature.view.landing.join_family_with_link.JoinFamilyWithLinkPage
+import com.no5ing.bbibbi.presentation.feature.view.landing.login.LoginPage
+import com.no5ing.bbibbi.presentation.feature.view.landing.onboarding.OnBoardingPage
 
 object LandingLoginDestination : NavigationDestination(
     route = landingLoginPageRoute,
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/MainDestination.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/MainDestination.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/MainDestination.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/MainDestination.kt
index f339ea9..2f148ab 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/MainDestination.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/MainDestination.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view_controller
+package com.no5ing.bbibbi.presentation.feature.view_controller
 
 import android.content.Intent
 import android.net.Uri
@@ -8,11 +8,11 @@ import androidx.compose.runtime.remember
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
 import androidx.navigation.navArgument
-import com.no5ing.bbibbi.presentation.view.main.calendar.MainCalendarPage
-import com.no5ing.bbibbi.presentation.view.main.calendar.detail.CalendarDetailPage
-import com.no5ing.bbibbi.presentation.view.main.family.FamilyPage
-import com.no5ing.bbibbi.presentation.view.main.home.HomePage
-import com.no5ing.bbibbi.presentation.view.main.profile.ProfilePage
+import com.no5ing.bbibbi.presentation.feature.view.main.calendar.MainCalendarPage
+import com.no5ing.bbibbi.presentation.feature.view.main.calendar.detail.CalendarDetailPage
+import com.no5ing.bbibbi.presentation.feature.view.main.family.FamilyPage
+import com.no5ing.bbibbi.presentation.feature.view.main.home.HomePage
+import com.no5ing.bbibbi.presentation.feature.view.main.profile.ProfilePage
 import timber.log.Timber
 import java.time.LocalDate
 
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/NavigationDestination.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/NavigationDestination.kt
similarity index 98%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/NavigationDestination.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/NavigationDestination.kt
index f9d22f7..0309cec 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/NavigationDestination.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/NavigationDestination.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view_controller
+package com.no5ing.bbibbi.presentation.feature.view_controller
 
 import androidx.compose.animation.AnimatedContentTransitionScope
 import androidx.compose.animation.EnterTransition
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/PostDestination.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/PostDestination.kt
similarity index 90%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/PostDestination.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/PostDestination.kt
index fe673a0..9d59d0b 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/PostDestination.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/PostDestination.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view_controller
+package com.no5ing.bbibbi.presentation.feature.view_controller
 
 import android.net.Uri
 import androidx.compose.runtime.Composable
@@ -8,9 +8,9 @@ import androidx.compose.runtime.remember
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
 import androidx.navigation.navArgument
-import com.no5ing.bbibbi.presentation.view.post.create_real_emoji.CreateRealEmojiPage
-import com.no5ing.bbibbi.presentation.view.post.upload.PostUploadPage
-import com.no5ing.bbibbi.presentation.view.post.view.PostViewPage
+import com.no5ing.bbibbi.presentation.feature.view.post.create_real_emoji.CreateRealEmojiPage
+import com.no5ing.bbibbi.presentation.feature.view.post.upload.PostUploadPage
+import com.no5ing.bbibbi.presentation.feature.view.post.view.PostViewPage
 
 object PostViewDestination : NavigationDestination(
     route = postViewPageRoute,
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/RegisterDestination.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/RegisterDestination.kt
similarity index 84%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/RegisterDestination.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/RegisterDestination.kt
index 5a2dcca..658f239 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/RegisterDestination.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/RegisterDestination.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.view_controller
+package com.no5ing.bbibbi.presentation.feature.view_controller
 
 import android.net.Uri
 import androidx.compose.runtime.Composable
@@ -7,11 +7,11 @@ import androidx.compose.runtime.remember
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
 import androidx.navigation.navArgument
-import com.no5ing.bbibbi.presentation.state.register.nickname.rememberRegisterNickNamePageState
-import com.no5ing.bbibbi.presentation.state.register.profile_image.rememberRegisterProfileImagePageState
-import com.no5ing.bbibbi.presentation.view.register.day_of_birth.RegisterDayOfBirthPage
-import com.no5ing.bbibbi.presentation.view.register.nickname.RegisterNickNamePage
-import com.no5ing.bbibbi.presentation.view.register.profile_image.RegisterProfileImagePage
+import com.no5ing.bbibbi.presentation.feature.state.register.nickname.rememberRegisterNickNamePageState
+import com.no5ing.bbibbi.presentation.feature.state.register.profile_image.rememberRegisterProfileImagePageState
+import com.no5ing.bbibbi.presentation.feature.view.register.day_of_birth.RegisterDayOfBirthPage
+import com.no5ing.bbibbi.presentation.feature.view.register.nickname.RegisterNickNamePage
+import com.no5ing.bbibbi.presentation.feature.view.register.profile_image.RegisterProfileImagePage
 
 object RegisterNicknameDestination : NavigationDestination(
     route = registerNickNameRoute,
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/SettingDestination.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/SettingDestination.kt
similarity index 87%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/SettingDestination.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/SettingDestination.kt
index 48d00c5..c113292 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/view_controller/SettingDestination.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/SettingDestination.kt
@@ -1,14 +1,14 @@
-package com.no5ing.bbibbi.presentation.view_controller
+package com.no5ing.bbibbi.presentation.feature.view_controller
 
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
 import androidx.navigation.navArgument
 import com.no5ing.bbibbi.BuildConfig
-import com.no5ing.bbibbi.presentation.view.setting.change_nickname.ChangeNicknamePage
-import com.no5ing.bbibbi.presentation.view.setting.home.SettingHomePage
-import com.no5ing.bbibbi.presentation.view.setting.quit.QuitPage
-import com.no5ing.bbibbi.presentation.view.setting.webview.WebViewPage
+import com.no5ing.bbibbi.presentation.feature.view.setting.change_nickname.ChangeNicknamePage
+import com.no5ing.bbibbi.presentation.feature.view.setting.home.SettingHomePage
+import com.no5ing.bbibbi.presentation.feature.view.setting.quit.QuitPage
+import com.no5ing.bbibbi.presentation.feature.view.setting.webview.WebViewPage
 import com.no5ing.bbibbi.util.forceRestart
 
 object SettingDestination : NavigationDestination(
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/BaseViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/BaseViewModel.kt
similarity index 97%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/BaseViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/BaseViewModel.kt
index ac47261..a9c9c03 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/BaseViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/BaseViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel
+package com.no5ing.bbibbi.presentation.feature.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/LoginWithCredentialsViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/LoginWithCredentialsViewModel.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/LoginWithCredentialsViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/LoginWithCredentialsViewModel.kt
index 1956880..b2679b6 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/LoginWithCredentialsViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/LoginWithCredentialsViewModel.kt
@@ -1,11 +1,11 @@
-package com.no5ing.bbibbi.presentation.viewmodel.auth
+package com.no5ing.bbibbi.presentation.feature.viewmodel.auth
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.auth.SocialLoginRequest
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.di.SessionModule
-import com.no5ing.bbibbi.presentation.state.landing.login.LoginStatus
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.state.landing.login.LoginStatus
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.skydoves.sandwich.retrofit.body
 import com.skydoves.sandwich.suspendOnFailure
 import com.skydoves.sandwich.suspendOnSuccess
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/LogoutViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/LogoutViewModel.kt
similarity index 88%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/LogoutViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/LogoutViewModel.kt
index 80cb621..b4641da 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/LogoutViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/LogoutViewModel.kt
@@ -1,11 +1,11 @@
-package com.no5ing.bbibbi.presentation.viewmodel.auth
+package com.no5ing.bbibbi.presentation.feature.viewmodel.auth
 
 import com.google.firebase.messaging.FirebaseMessaging
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.OperationStatus
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.di.SessionModule
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.tasks.await
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/QuitViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/QuitViewModel.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/QuitViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/QuitViewModel.kt
index d623f14..89a7a2c 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/QuitViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/QuitViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.auth
+package com.no5ing.bbibbi.presentation.feature.viewmodel.auth
 
 import com.google.firebase.messaging.FirebaseMessaging
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
@@ -9,7 +9,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.idle
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.di.SessionModule
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.skydoves.sandwich.suspendOnSuccess
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/RegisterMemberViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RegisterMemberViewModel.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/RegisterMemberViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RegisterMemberViewModel.kt
index 51a8a8e..58f99c8 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/RegisterMemberViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RegisterMemberViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.auth
+package com.no5ing.bbibbi.presentation.feature.viewmodel.auth
 
 import android.content.Context
 import android.net.Uri
@@ -12,7 +12,7 @@ import com.no5ing.bbibbi.data.model.auth.RegisterRequest
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.di.SessionModule
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.no5ing.bbibbi.util.uploadImage
 import com.skydoves.sandwich.onError
 import com.skydoves.sandwich.onSuccess
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/RetrieveAppVersionViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RetrieveAppVersionViewModel.kt
similarity index 87%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/RetrieveAppVersionViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RetrieveAppVersionViewModel.kt
index 8c8996e..634f9dd 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/RetrieveAppVersionViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RetrieveAppVersionViewModel.kt
@@ -1,11 +1,11 @@
-package com.no5ing.bbibbi.presentation.viewmodel.auth
+package com.no5ing.bbibbi.presentation.feature.viewmodel.auth
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.model.auth.AppVersion
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/RetrieveMeViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RetrieveMeViewModel.kt
similarity index 90%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/RetrieveMeViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RetrieveMeViewModel.kt
index 57cc4f7..6b99f52 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/auth/RetrieveMeViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RetrieveMeViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.auth
+package com.no5ing.bbibbi.presentation.feature.viewmodel.auth
 
 import android.net.Uri
 import com.no5ing.bbibbi.data.datasource.local.LocalDataStorage
@@ -7,7 +7,7 @@ import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/CreateFamilyAndJoinViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/CreateFamilyAndJoinViewModel.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/CreateFamilyAndJoinViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/CreateFamilyAndJoinViewModel.kt
index 47e07c1..798a35a 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/CreateFamilyAndJoinViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/CreateFamilyAndJoinViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.family
+package com.no5ing.bbibbi.presentation.feature.viewmodel.family
 
 import com.no5ing.bbibbi.data.datasource.local.LocalDataStorage
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
@@ -7,7 +7,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.model.family.Family
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.di.SessionModule
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.skydoves.sandwich.ApiResponse
 import com.skydoves.sandwich.suspendOnFailure
 import com.skydoves.sandwich.suspendOnSuccess
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/FamilyInviteLinkViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/FamilyInviteLinkViewModel.kt
similarity index 87%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/FamilyInviteLinkViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/FamilyInviteLinkViewModel.kt
index 00c5861..979708a 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/FamilyInviteLinkViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/FamilyInviteLinkViewModel.kt
@@ -1,11 +1,11 @@
-package com.no5ing.bbibbi.presentation.viewmodel.family
+package com.no5ing.bbibbi.presentation.feature.viewmodel.family
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.model.link.DeepLink
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/JoinFamilyWithLinkViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/JoinFamilyWithLinkViewModel.kt
similarity index 93%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/JoinFamilyWithLinkViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/JoinFamilyWithLinkViewModel.kt
index 1d191c2..0ee3710 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/JoinFamilyWithLinkViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/JoinFamilyWithLinkViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.family
+package com.no5ing.bbibbi.presentation.feature.viewmodel.family
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.datasource.network.request.member.JoinFamilyRequest
@@ -7,7 +7,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.model.family.Family
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.di.SessionModule
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.skydoves.sandwich.ApiResponse
 import com.skydoves.sandwich.suspendOnFailure
 import com.skydoves.sandwich.suspendOnSuccess
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/QuitFamilyViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/QuitFamilyViewModel.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/QuitFamilyViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/QuitFamilyViewModel.kt
index ece9f34..4d6aada 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/QuitFamilyViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/QuitFamilyViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.family
+package com.no5ing.bbibbi.presentation.feature.viewmodel.family
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.datasource.network.response.DefaultResponse
@@ -6,7 +6,7 @@ import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.di.SessionModule
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.skydoves.sandwich.ApiResponse
 import com.skydoves.sandwich.suspendOnFailure
 import com.skydoves.sandwich.suspendOnSuccess
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/ChangeNicknameViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/ChangeNicknameViewModel.kt
similarity index 91%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/ChangeNicknameViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/ChangeNicknameViewModel.kt
index 18d1edf..83109cf 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/ChangeNicknameViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/ChangeNicknameViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.members
+package com.no5ing.bbibbi.presentation.feature.viewmodel.members
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.datasource.network.request.member.ChangeNameRequest
@@ -7,7 +7,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.loading
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/ChangeProfileImageViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/ChangeProfileImageViewModel.kt
similarity index 94%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/ChangeProfileImageViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/ChangeProfileImageViewModel.kt
index 460091c..8106fd2 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/ChangeProfileImageViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/ChangeProfileImageViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.members
+package com.no5ing.bbibbi.presentation.feature.viewmodel.members
 
 import android.net.Uri
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
@@ -9,7 +9,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.loading
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.no5ing.bbibbi.util.uploadImage
 import com.skydoves.sandwich.suspendOnError
 import com.skydoves.sandwich.suspendOnSuccess
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/FamilyMemberViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/FamilyMemberViewModel.kt
similarity index 87%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/FamilyMemberViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/FamilyMemberViewModel.kt
index ec5c766..cd8528f 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/FamilyMemberViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/FamilyMemberViewModel.kt
@@ -1,11 +1,11 @@
-package com.no5ing.bbibbi.presentation.viewmodel.members
+package com.no5ing.bbibbi.presentation.feature.viewmodel.members
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/FamilyMembersViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/FamilyMembersViewModel.kt
similarity index 91%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/FamilyMembersViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/FamilyMembersViewModel.kt
index 8eddd2b..8a86a99 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/FamilyMembersViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/FamilyMembersViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.members
+package com.no5ing.bbibbi.presentation.feature.viewmodel.members
 
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
@@ -6,7 +6,7 @@ import androidx.paging.cachedIn
 import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.data.repository.member.GetMembersRepository
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/AddPostReactionViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/AddPostReactionViewModel.kt
similarity index 87%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/AddPostReactionViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/AddPostReactionViewModel.kt
index af73061..9dd2dc1 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/AddPostReactionViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/AddPostReactionViewModel.kt
@@ -1,9 +1,9 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.datasource.network.request.post.CreatePostReactionRequest
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/AddRealEmojiViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/AddRealEmojiViewModel.kt
similarity index 88%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/AddRealEmojiViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/AddRealEmojiViewModel.kt
index e16ba40..3a04b9a 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/AddRealEmojiViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/AddRealEmojiViewModel.kt
@@ -1,9 +1,9 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.datasource.network.request.member.AddPostRealEmojiRequest
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CalendarDetailContentViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarDetailContentViewModel.kt
similarity index 88%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CalendarDetailContentViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarDetailContentViewModel.kt
index 1f72dcf..fc244e8 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CalendarDetailContentViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarDetailContentViewModel.kt
@@ -1,12 +1,13 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.local.MemberCacheProvider
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
+import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.uistate.family.MainFeedUiState
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.skydoves.sandwich.suspendMapSuccess
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
@@ -54,7 +55,7 @@ class CalendarDetailContentViewModel @Inject constructor(
                     memberCacheProvider.getMember(this.authorId)
                 }
                 val uiState = MainFeedUiState(
-                    writer = member.getOrElse { com.no5ing.bbibbi.data.model.member.Member.unknown() },
+                    writer = member.getOrElse { Member.unknown() },
                     post = this
                 )
                 detailCache[it] = uiState
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CalendarMonthViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarMonthViewModel.kt
similarity index 92%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CalendarMonthViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarMonthViewModel.kt
index 4319cd1..b266574 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CalendarMonthViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarMonthViewModel.kt
@@ -1,9 +1,9 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.post.CalendarElement
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.skydoves.sandwich.suspendOnSuccess
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CalendarWeekViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarWeekViewModel.kt
similarity index 93%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CalendarWeekViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarWeekViewModel.kt
index fe5fb1d..4959d90 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CalendarWeekViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarWeekViewModel.kt
@@ -1,9 +1,9 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.post.CalendarElement
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.no5ing.bbibbi.util.toYearMonth
 import com.skydoves.sandwich.suspendOnSuccess
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CreatePostCommentViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CreatePostCommentViewModel.kt
similarity index 90%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CreatePostCommentViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CreatePostCommentViewModel.kt
index bae838f..d6f0c24 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CreatePostCommentViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CreatePostCommentViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.datasource.network.request.post.CreatePostCommentRequest
@@ -6,7 +6,7 @@ import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.model.post.PostComment
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CreatePostViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CreatePostViewModel.kt
similarity index 95%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CreatePostViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CreatePostViewModel.kt
index 5094984..4fa4e87 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/CreatePostViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CreatePostViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import android.net.Uri
 import com.no5ing.bbibbi.data.datasource.local.LocalDataStorage
@@ -9,7 +9,7 @@ import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.model.post.Post
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.no5ing.bbibbi.util.getZonedDateTimeString
 import com.no5ing.bbibbi.util.uploadImage
 import com.skydoves.sandwich.suspendOnSuccess
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/DailyFamilyTopViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/DailyFamilyTopViewModel.kt
similarity index 89%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/DailyFamilyTopViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/DailyFamilyTopViewModel.kt
index f1adc2b..2e3b542 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/DailyFamilyTopViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/DailyFamilyTopViewModel.kt
@@ -1,8 +1,8 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.no5ing.bbibbi.util.todayAsString
 import com.skydoves.sandwich.suspendOnSuccess
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/DeletePostCommentViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/DeletePostCommentViewModel.kt
similarity index 89%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/DeletePostCommentViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/DeletePostCommentViewModel.kt
index a4f45a2..53fc27e 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/DeletePostCommentViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/DeletePostCommentViewModel.kt
@@ -1,11 +1,11 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.datasource.network.response.DefaultResponse
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/FamilyPostViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilyPostViewModel.kt
similarity index 80%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/FamilyPostViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilyPostViewModel.kt
index abc7607..7c4b1de 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/FamilyPostViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilyPostViewModel.kt
@@ -1,12 +1,13 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.local.MemberCacheProvider
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
+import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.uistate.family.MainFeedUiState
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.skydoves.sandwich.suspendMapSuccess
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -30,7 +31,7 @@ class FamilyPostViewModel @Inject constructor(
                     memberCacheProvider.getMember(this.authorId)
                 }
                 MainFeedUiState(
-                    writer = member.getOrElse { com.no5ing.bbibbi.data.model.member.Member.unknown() },
+                    writer = member.getOrElse { Member.unknown() },
                     post = this
                 )
             }
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/FamilyPostsViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilyPostsViewModel.kt
similarity index 91%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/FamilyPostsViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilyPostsViewModel.kt
index 4a0f26b..d4a7946 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/FamilyPostsViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilyPostsViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
@@ -6,7 +6,7 @@ import androidx.paging.cachedIn
 import com.no5ing.bbibbi.data.model.post.Post
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.data.repository.post.GetPostsRepository
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/FamilySwipePostsViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilySwipePostsViewModel.kt
similarity index 81%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/FamilySwipePostsViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilySwipePostsViewModel.kt
index e19345e..8f62871 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/FamilySwipePostsViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilySwipePostsViewModel.kt
@@ -1,11 +1,12 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.local.MemberCacheProvider
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.APIResponse
+import com.no5ing.bbibbi.data.model.member.Member
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.uistate.family.MainFeedUiState
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.skydoves.sandwich.suspendMapSuccess
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -34,7 +35,7 @@ class FamilySwipePostsViewModel @Inject constructor(
                         memberCacheProvider.getMember(it.authorId)
                     }
                     MainFeedUiState(
-                        writer = member.getOrElse { com.no5ing.bbibbi.data.model.member.Member.unknown() },
+                        writer = member.getOrElse { Member.unknown() },
                         post = it
                     )
                 }
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/IsMeUploadedTodayViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/IsMeUploadedTodayViewModel.kt
similarity index 91%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/IsMeUploadedTodayViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/IsMeUploadedTodayViewModel.kt
index 86a20e8..32d4192 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/IsMeUploadedTodayViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/IsMeUploadedTodayViewModel.kt
@@ -1,10 +1,10 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.local.LocalDataStorage
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.no5ing.bbibbi.util.todayAsString
 import com.skydoves.sandwich.suspendOnSuccess
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/MainPostFeedViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MainPostFeedViewModel.kt
similarity index 87%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/MainPostFeedViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MainPostFeedViewModel.kt
index 279b628..8bb119a 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/MainPostFeedViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MainPostFeedViewModel.kt
@@ -1,12 +1,12 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.data.repository.post.GetFeedsRepository
-import com.no5ing.bbibbi.presentation.uistate.family.MainFeedUiState
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/MemberRealEmojiListViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MemberRealEmojiListViewModel.kt
similarity index 91%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/MemberRealEmojiListViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MemberRealEmojiListViewModel.kt
index d6f911b..ee75b9b 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/MemberRealEmojiListViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MemberRealEmojiListViewModel.kt
@@ -1,11 +1,11 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.local.LocalDataStorage
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.member.MemberRealEmoji
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.di.SessionModule
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.skydoves.sandwich.suspendOnSuccess
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/MonthlyStatisticsViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MonthlyStatisticsViewModel.kt
similarity index 88%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/MonthlyStatisticsViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MonthlyStatisticsViewModel.kt
index 592d8dc..2188500 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/MonthlyStatisticsViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MonthlyStatisticsViewModel.kt
@@ -1,11 +1,11 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.APIResponse
 import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.model.post.CalendarBanner
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/PostCommentViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/PostCommentViewModel.kt
similarity index 86%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/PostCommentViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/PostCommentViewModel.kt
index 076da93..5d9ede7 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/PostCommentViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/PostCommentViewModel.kt
@@ -1,12 +1,12 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.data.repository.post.GetCommentsRepository
-import com.no5ing.bbibbi.presentation.uistate.post.PostCommentUiState
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.uistate.post.PostCommentUiState
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/PostReactionBarViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/PostReactionBarViewModel.kt
similarity index 94%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/PostReactionBarViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/PostReactionBarViewModel.kt
index 94f7ea2..271dd49 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/PostReactionBarViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/PostReactionBarViewModel.kt
@@ -1,14 +1,14 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import androidx.lifecycle.viewModelScope
 import com.no5ing.bbibbi.data.datasource.local.MemberCacheProvider
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.model.member.MemberRealEmoji
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.uistate.post.NormalPostReactionUiState
-import com.no5ing.bbibbi.presentation.uistate.post.PostReactionUiState
-import com.no5ing.bbibbi.presentation.uistate.post.RealEmojiPostReactionUiState
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.uistate.post.NormalPostReactionUiState
+import com.no5ing.bbibbi.presentation.feature.uistate.post.PostReactionUiState
+import com.no5ing.bbibbi.presentation.feature.uistate.post.RealEmojiPostReactionUiState
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.no5ing.bbibbi.util.parallelMap
 import com.skydoves.sandwich.suspendOnSuccess
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/RemovePostReactionViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/RemovePostReactionViewModel.kt
similarity index 87%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/RemovePostReactionViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/RemovePostReactionViewModel.kt
index 044c273..4deb4cc 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/RemovePostReactionViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/RemovePostReactionViewModel.kt
@@ -1,9 +1,9 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.datasource.network.request.post.DeletePostReactionRequest
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/RemoveRealEmojiViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/RemoveRealEmojiViewModel.kt
similarity index 86%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/RemoveRealEmojiViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/RemoveRealEmojiViewModel.kt
index 699348f..bd05701 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/RemoveRealEmojiViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/RemoveRealEmojiViewModel.kt
@@ -1,8 +1,8 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import com.no5ing.bbibbi.data.datasource.network.RestAPI
 import com.no5ing.bbibbi.data.repository.Arguments
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/UpdateMemberPostRealEmojiViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/UpdateMemberPostRealEmojiViewModel.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/UpdateMemberPostRealEmojiViewModel.kt
rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/UpdateMemberPostRealEmojiViewModel.kt
index 583e2c8..dc7bba3 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/post/UpdateMemberPostRealEmojiViewModel.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/UpdateMemberPostRealEmojiViewModel.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.viewmodel.post
+package com.no5ing.bbibbi.presentation.feature.viewmodel.post
 
 import android.net.Uri
 import androidx.annotation.OptIn
@@ -12,7 +12,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse
 import com.no5ing.bbibbi.data.model.member.MemberRealEmoji
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.di.SessionModule
-import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel
+import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel
 import com.no5ing.bbibbi.util.uploadImage
 import com.skydoves.sandwich.suspendOnError
 import com.skydoves.sandwich.suspendOnSuccess
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/LandingNavGraph.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/LandingNavGraph.kt
index 6d4f5a1..7d67459 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/LandingNavGraph.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/LandingNavGraph.kt
@@ -4,13 +4,13 @@ import androidx.compose.runtime.Stable
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.navigation
-import com.no5ing.bbibbi.presentation.view_controller.LandingAlreadyFamilyExistsDestination
-import com.no5ing.bbibbi.presentation.view_controller.LandingJoinFamilyDestination
-import com.no5ing.bbibbi.presentation.view_controller.LandingJoinFamilyWithLinkDestination
-import com.no5ing.bbibbi.presentation.view_controller.LandingLoginDestination
-import com.no5ing.bbibbi.presentation.view_controller.LandingOnBoardingDestination
-import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.composable
-import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.landingPageRoute
+import com.no5ing.bbibbi.presentation.feature.view_controller.LandingAlreadyFamilyExistsDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.LandingJoinFamilyDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.LandingJoinFamilyWithLinkDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.LandingLoginDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.LandingOnBoardingDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.composable
+import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.landingPageRoute
 
 @Stable
 fun NavGraphBuilder.landingGraph(
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/MainNavGraph.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/MainNavGraph.kt
index 0aba799..3afdecd 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/MainNavGraph.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/MainNavGraph.kt
@@ -13,21 +13,21 @@ import com.no5ing.bbibbi.presentation.ui.navigation.animation.fullHorizontalSlid
 import com.no5ing.bbibbi.presentation.ui.navigation.animation.fullHorizontalSlideOutToRight
 import com.no5ing.bbibbi.presentation.ui.navigation.animation.fullSlideInVertically
 import com.no5ing.bbibbi.presentation.ui.navigation.animation.fullSlideOutVertically
-import com.no5ing.bbibbi.presentation.view_controller.ChangeNicknameDestination
-import com.no5ing.bbibbi.presentation.view_controller.CreateRealEmojiDestination
-import com.no5ing.bbibbi.presentation.view_controller.MainCalendarDestination
-import com.no5ing.bbibbi.presentation.view_controller.MainCalendarDetailDestination
-import com.no5ing.bbibbi.presentation.view_controller.MainFamilyDestination
-import com.no5ing.bbibbi.presentation.view_controller.MainHomeDestination
-import com.no5ing.bbibbi.presentation.view_controller.MainProfileDestination
-import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.composable
-import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.mainPageRoute
-import com.no5ing.bbibbi.presentation.view_controller.PostReUploadDestination
-import com.no5ing.bbibbi.presentation.view_controller.PostUploadDestination
-import com.no5ing.bbibbi.presentation.view_controller.PostViewDestination
-import com.no5ing.bbibbi.presentation.view_controller.QuitDestination
-import com.no5ing.bbibbi.presentation.view_controller.SettingDestination
-import com.no5ing.bbibbi.presentation.view_controller.WebViewDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.ChangeNicknameDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.CreateRealEmojiDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.MainCalendarDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.MainCalendarDetailDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.MainFamilyDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.MainHomeDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.MainProfileDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.composable
+import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.mainPageRoute
+import com.no5ing.bbibbi.presentation.feature.view_controller.PostReUploadDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.PostUploadDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.PostViewDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.QuitDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.SettingDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.WebViewDestination
 
 @OptIn(ExperimentalAnimationApi::class)
 @Stable
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/RegisterNavGraph.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/RegisterNavGraph.kt
index d0e1e3e..48e1f59 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/RegisterNavGraph.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/RegisterNavGraph.kt
@@ -6,11 +6,11 @@ import androidx.compose.runtime.Stable
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.navigation
-import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.composable
-import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.registerPageRoute
-import com.no5ing.bbibbi.presentation.view_controller.RegisterDayOfBirthDestination
-import com.no5ing.bbibbi.presentation.view_controller.RegisterNicknameDestination
-import com.no5ing.bbibbi.presentation.view_controller.RegisterProfileImageDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.composable
+import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.registerPageRoute
+import com.no5ing.bbibbi.presentation.feature.view_controller.RegisterDayOfBirthDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.RegisterNicknameDestination
+import com.no5ing.bbibbi.presentation.feature.view_controller.RegisterProfileImageDestination
 
 @Stable
 fun NavGraphBuilder.registerGraph(
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/util/LifeCycleObserver.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/util/LifeCycleObserver.kt
deleted file mode 100644
index 9bd82e7..0000000
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/util/LifeCycleObserver.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.no5ing.bbibbi.presentation.ui.util
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
-import androidx.lifecycle.LifecycleOwner
-
-@Composable
-fun OnLifecycleEvent(onEvent: (owner: LifecycleOwner, event: Lifecycle.Event) -> Unit) {
-    val eventHandler = rememberUpdatedState(onEvent)
-    val lifecycleOwner = rememberUpdatedState(LocalLifecycleOwner.current)
-
-    DisposableEffect(lifecycleOwner.value) {
-        val lifecycle = lifecycleOwner.value.lifecycle
-        val observer = LifecycleEventObserver { owner, event ->
-            eventHandler.value(owner, event)
-        }
-
-        lifecycle.addObserver(observer)
-        onDispose {
-            lifecycle.removeObserver(observer)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/uistate/family/FamilyInviteLinkUiState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/uistate/family/FamilyInviteLinkUiState.kt
deleted file mode 100644
index 1a66ab5..0000000
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/uistate/family/FamilyInviteLinkUiState.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.no5ing.bbibbi.presentation.uistate.family
-
-data class FamilyInviteLinkUiState(
-    val url: String
-)
diff --git a/app/src/main/java/com/no5ing/bbibbi/util/LocalProvider.kt b/app/src/main/java/com/no5ing/bbibbi/util/LocalProvider.kt
index 0064da6..9646393 100644
--- a/app/src/main/java/com/no5ing/bbibbi/util/LocalProvider.kt
+++ b/app/src/main/java/com/no5ing/bbibbi/util/LocalProvider.kt
@@ -5,7 +5,7 @@ import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.navigation.NavHostController
 import com.mixpanel.android.mpmetrics.MixpanelAPI
-import com.no5ing.bbibbi.presentation.uistate.common.SessionState
+import com.no5ing.bbibbi.presentation.feature.uistate.common.SessionState
 
 val LocalSnackbarHostState =
     staticCompositionLocalOf<SnackbarHostState> { error("No SnackbarHostState provided") }
diff --git a/build.gradle.kts b/build.gradle.kts
index 6e3c541..46330d0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     id("com.google.gms.google-services") version "4.4.0" apply false
     id("com.google.firebase.crashlytics") version "2.9.9" apply false
     id("com.android.test") version "8.2.1" apply false
+    id("com.android.library") version "8.2.1" apply false
 }
 
 buildscript {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 93dce30..0f6f006 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,3 +17,4 @@ dependencyResolutionManagement {
 rootProject.name = "bbibbi"
 include(":app")
 include(":benchmark")
+include(":widget")
diff --git a/widget/.gitignore b/widget/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/widget/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/widget/build.gradle.kts b/widget/build.gradle.kts
new file mode 100644
index 0000000..89692ed
--- /dev/null
+++ b/widget/build.gradle.kts
@@ -0,0 +1,68 @@
+import java.util.Properties
+
+plugins {
+    id("com.android.library")
+    id("kotlin-kapt")
+    id("kotlin-parcelize")
+    id("org.jetbrains.kotlin.android")
+    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
+}
+
+secrets {
+    propertiesFileName = "secrets.properties"
+}
+val secretFile = file("../secrets.properties")
+val secretProperties = Properties().apply {
+    load(secretFile.inputStream())
+}
+
+android {
+    namespace = "com.no5ing.bbibbi.widget"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 26
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    buildFeatures{
+        compose = true
+        buildConfig = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.3"
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+dependencies {
+    implementation("androidx.security:security-crypto:1.1.0-alpha06")
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.9.0")
+    implementation("io.coil-kt:coil-compose:2.5.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    implementation("androidx.glance:glance-appwidget:1.0.0")
+    implementation("androidx.glance:glance-material3:1.0.0")
+    implementation("androidx.work:work-runtime-ktx:2.9.0")
+    implementation("com.google.code.gson:gson:2.10.1")
+}
\ No newline at end of file
diff --git a/widget/consumer-rules.pro b/widget/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/widget/proguard-rules.pro b/widget/proguard-rules.pro
new file mode 100644
index 0000000..e96c3db
--- /dev/null
+++ b/widget/proguard-rules.pro
@@ -0,0 +1,55 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+-keep public class androidx.compose.*.**{*;}
+-keep class kotlin.reflect.** { *; }
+-keep class kotlin.Metadata { *; }
+-keep class com.no5ing.bbibbi.widget.** { *; }
+-dontwarn java.lang.invoke.StringConcatFactory
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-dontwarn sun.misc.**
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.google.gson.examples.android.model.** { <fields>; }
+
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
+
+##---------------End: proguard configuration for Gson  ----------
\ No newline at end of file
diff --git a/widget/src/androidTest/java/com/no5ing/bbibbi/widget/ExampleInstrumentedTest.kt b/widget/src/androidTest/java/com/no5ing/bbibbi/widget/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..f340755
--- /dev/null
+++ b/widget/src/androidTest/java/com/no5ing/bbibbi/widget/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.no5ing.bbibbi.widget
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.no5ing.bbibbi.widget.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/widget/src/main/AndroidManifest.xml b/widget/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..a5918e6
--- /dev/null
+++ b/widget/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/widget/AppWidget.kt b/widget/src/main/java/com/no5ing/bbibbi/widget/AppWidget.kt
similarity index 96%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/widget/AppWidget.kt
rename to widget/src/main/java/com/no5ing/bbibbi/widget/AppWidget.kt
index 3648654..5ec20a2 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/widget/AppWidget.kt
+++ b/widget/src/main/java/com/no5ing/bbibbi/widget/AppWidget.kt
@@ -1,10 +1,15 @@
-package com.no5ing.bbibbi.presentation.ui.widget
+package com.no5ing.bbibbi.widget
 
+import android.annotation.SuppressLint
+import android.content.ComponentName
 import android.content.Context
 import android.content.res.Resources
 import android.graphics.BitmapFactory
 import android.graphics.Rect
+import android.os.Build
 import android.text.TextPaint
+import android.util.Log
+import androidx.annotation.RequiresApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.DpSize
@@ -49,15 +54,10 @@ import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.NetworkType
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
-import com.no5ing.bbibbi.MainActivity
-import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.util.codePointLength
-import com.no5ing.bbibbi.util.randomBoolean
-import com.no5ing.bbibbi.util.toCodePointList
 import kotlinx.coroutines.coroutineScope
-import timber.log.Timber
 import java.time.Duration
 
+private const val TAG = "WIDGET"
 class AppWidget : GlanceAppWidget() {
     companion object {
         const val WIDGET_UNAUTHENTICATED = "unauthenticated"
@@ -82,14 +82,15 @@ class AppWidget : GlanceAppWidget() {
         val manager = GlanceAppWidgetManager(context)
         val glanceIds = manager.getGlanceIds(AppWidget::class.java)
         if (glanceIds.isEmpty()) {
-            Timber.d("Cancel Widget Schedule")
+            Log.d(TAG, "Cancel Widget Schedule")
             WorkManager.getInstance(context).cancelUniqueWork(WIDGET_WORKER_NAME)
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     override suspend fun provideGlance(context: Context, id: GlanceId) {
         coroutineScope {
-            Timber.d("Start Widget Schedule")
+            Log.d(TAG, "Start Widget Schedule")
             WorkManager.getInstance(context).enqueueUniquePeriodicWork(
                 WIDGET_WORKER_NAME,
                 ExistingPeriodicWorkPolicy.KEEP,
@@ -123,7 +124,7 @@ class AppWidget : GlanceAppWidget() {
                 modifier = GlanceModifier
                     .size(width = aspectSize, height = aspectSize)
                     .background(Color(0xFF262626))
-                    .clickable(actionStartActivity<MainActivity>())
+                    .clickable(actionStartActivity(ComponentName("com.no5ing.bbibbi", "com.no5ing.bbibbi.MainActivity")))
             ) {
                 when (result) {
                     WIDGET_SUCCESS -> {
@@ -280,6 +281,7 @@ class AppWidget : GlanceAppWidget() {
 
     }
 
+    @SuppressLint("RestrictedApi")
     @Composable
     fun EmptyBox(
         isSmallSize: Boolean,
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/widget/WidgetImageWorker.kt b/widget/src/main/java/com/no5ing/bbibbi/widget/WidgetImageWorker.kt
similarity index 87%
rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/widget/WidgetImageWorker.kt
rename to widget/src/main/java/com/no5ing/bbibbi/widget/WidgetImageWorker.kt
index d9936b3..e590342 100644
--- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/widget/WidgetImageWorker.kt
+++ b/widget/src/main/java/com/no5ing/bbibbi/widget/WidgetImageWorker.kt
@@ -1,4 +1,4 @@
-package com.no5ing.bbibbi.presentation.ui.widget
+package com.no5ing.bbibbi.widget
 
 import android.app.Notification
 import android.content.Context
@@ -6,6 +6,7 @@ import android.content.Intent
 import android.content.Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
 import android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION
 import android.content.pm.PackageManager
+import android.util.Log
 import androidx.core.content.FileProvider.getUriForFile
 import androidx.datastore.preferences.core.MutablePreferences
 import androidx.glance.appwidget.GlanceAppWidgetManager
@@ -20,18 +21,15 @@ import coil.memory.MemoryCache
 import coil.request.ErrorResult
 import coil.request.ImageRequest
 import com.google.gson.Gson
-import com.no5ing.bbibbi.BuildConfig
-import com.no5ing.bbibbi.data.datasource.local.LocalDataStorage
-import com.no5ing.bbibbi.data.model.widget.WidgetResult
+import com.google.gson.JsonParser
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import timber.log.Timber
-
 
+private const val TAG = "WidgetImageWorker"
 class WidgetImageWorker(
     private val context: Context,
     workerParameters: WorkerParameters
@@ -42,7 +40,7 @@ class WidgetImageWorker(
 
     override suspend fun doWork(): Result {
         return try {
-            Timber.d("Updating widget...")
+            Log.d(TAG, "Updating widget...")
             updateImageWidget { prefs ->
                 prefs[AppWidget.resultKey] = AppWidget.WIDGET_LOADING
             }
@@ -53,15 +51,15 @@ class WidgetImageWorker(
                 if (apiResult.isSuccessful) {
                     if (apiResult.code == 200) {
                         val newToken = apiResult.body!!.string()
-                        val newWidget = Gson().fromJson(newToken, WidgetResult::class.java)
+                        val newWidgetToken = JsonParser.parseString(newToken).asJsonObject
                         updateImageWidget { prefs ->
                             prefs[AppWidget.resultKey] = AppWidget.WIDGET_SUCCESS
-                            prefs[AppWidget.imageKey] = loadImage(newWidget.postImageUrl, force)
-                            prefs[AppWidget.postContentKey] = newWidget.postContent
-                            newWidget.profileImageUrl?.let { loadImage(it, force) }?.apply {
+                            prefs[AppWidget.imageKey] = loadImage(newWidgetToken.get("postImageUrl").asString, force)
+                            prefs[AppWidget.postContentKey] = newWidgetToken.get("postContent").asString
+                            newWidgetToken?.get("profileImageUrl")?.asString?.let { loadImage(it, force) }?.apply {
                                 prefs[AppWidget.profileImageKey] = this
                             } ?: Unit.apply {
-                                prefs[AppWidget.userNameKey] = newWidget.authorName
+                                prefs[AppWidget.userNameKey] = newWidgetToken?.get("authorName")?.asString ?: "?"
                                 prefs.remove(AppWidget.profileImageKey)
                             }
                         }
@@ -78,7 +76,8 @@ class WidgetImageWorker(
             }
             Result.success()
         } catch (e: Exception) {
-            Timber.e(e, "Error while loading image")
+            Log.e(TAG, "Error while loading image")
+            e.printStackTrace()
             if (runAttemptCount < 10) {
                 // Exponential backoff strategy will avoid the request to repeat
                 // too fast in case of failures.
@@ -160,7 +159,7 @@ class WidgetImageWorker(
             .get()
             .build()
         val response = client.newCall(widgetRequest).execute()
-        Timber.d("[NetworkModule] Invoke widget refresh $response")
+        Log.d(TAG, "[NetworkModule] Invoke widget refresh $response")
         return response
     }
 
@@ -173,20 +172,19 @@ class WidgetImageWorker(
 
     private fun createInterceptor(): Interceptor = Interceptor {
         val request = it.request()
-        val localDataStorage = LocalDataStorage(context)
+        val accessToken = getAuthTokenFromContext(context)
         val modifiedRequest = with(request) {
             return@with newBuilder()
                 .header("Accept", "application/json")
                 .header("X-APP-KEY", BuildConfig.appKey)
-                .header("X-APP-VERSION", BuildConfig.VERSION_NAME)
-                .header("X-AUTH-TOKEN", localDataStorage.getAuthTokens()?.accessToken ?: "")
+                .header("X-AUTH-TOKEN", accessToken ?: "")
                 .header("X-USER-PLATFORM", "AOS")
                 .header("X-USER-ID", "WIDGET")
                 .build()
         }
 
         val response = it.proceed(modifiedRequest)
-        Timber.d("[NetworkModule] Invoke widget refresh")
+        Log.d(TAG, "[NetworkModule] Invoke widget refresh")
         response
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/no5ing/bbibbi/WidgetReceiver.kt b/widget/src/main/java/com/no5ing/bbibbi/widget/WidgetReceiver.kt
similarity index 72%
rename from app/src/main/java/com/no5ing/bbibbi/WidgetReceiver.kt
rename to widget/src/main/java/com/no5ing/bbibbi/widget/WidgetReceiver.kt
index f6fe31f..22496c1 100644
--- a/app/src/main/java/com/no5ing/bbibbi/WidgetReceiver.kt
+++ b/widget/src/main/java/com/no5ing/bbibbi/widget/WidgetReceiver.kt
@@ -1,8 +1,7 @@
-package com.no5ing.bbibbi
+package com.no5ing.bbibbi.widget
 
 import androidx.glance.appwidget.GlanceAppWidget
 import androidx.glance.appwidget.GlanceAppWidgetReceiver
-import com.no5ing.bbibbi.presentation.ui.widget.AppWidget
 
 class WidgetReceiver : GlanceAppWidgetReceiver() {
     override val glanceAppWidget: GlanceAppWidget = AppWidget()
diff --git a/widget/src/main/java/com/no5ing/bbibbi/widget/WidgetUtil.kt b/widget/src/main/java/com/no5ing/bbibbi/widget/WidgetUtil.kt
new file mode 100644
index 0000000..3e06ba0
--- /dev/null
+++ b/widget/src/main/java/com/no5ing/bbibbi/widget/WidgetUtil.kt
@@ -0,0 +1,37 @@
+package com.no5ing.bbibbi.widget
+
+import android.content.Context
+import android.security.keystore.KeyGenParameterSpec
+import android.security.keystore.KeyProperties
+import androidx.security.crypto.EncryptedSharedPreferences
+import androidx.security.crypto.MasterKey
+import com.google.gson.Gson
+import com.google.gson.JsonParser
+import kotlin.streams.toList
+
+fun String.toCodePointList() = codePoints().toList().map { String(Character.toChars(it)) }
+fun String.codePointLength() = codePoints().count()
+fun randomBoolean() = (0..1).random() == 1
+
+fun getAuthTokenFromContext(context: Context): String? {
+    val preferences = EncryptedSharedPreferences.create(
+        context,
+        "Encrypted_Shared_Preferences",
+        MasterKey.Builder(context)
+            .setKeyGenParameterSpec(KeyGenParameterSpec.Builder(
+                MasterKey.DEFAULT_MASTER_KEY_ALIAS,
+                KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
+            )
+                .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
+                .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
+                .setKeySize(MasterKey.DEFAULT_AES_GCM_MASTER_KEY_SIZE)
+                .build())
+            .build(),
+        EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+        EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+    )
+    val json = preferences.getString("auth_result_key", null)
+    return runCatching {
+        JsonParser.parseString(json).asJsonObject.get("accessToken").asString
+    }.getOrElse { null }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/widget_large.xml b/widget/src/main/res/drawable/widget_large.xml
similarity index 100%
rename from app/src/main/res/drawable/widget_large.xml
rename to widget/src/main/res/drawable/widget_large.xml
diff --git a/app/src/main/res/drawable/widget_large_green.xml b/widget/src/main/res/drawable/widget_large_green.xml
similarity index 100%
rename from app/src/main/res/drawable/widget_large_green.xml
rename to widget/src/main/res/drawable/widget_large_green.xml
diff --git a/app/src/main/res/drawable/widget_small.xml b/widget/src/main/res/drawable/widget_small.xml
similarity index 100%
rename from app/src/main/res/drawable/widget_small.xml
rename to widget/src/main/res/drawable/widget_small.xml
diff --git a/app/src/main/res/drawable/widget_small_green.xml b/widget/src/main/res/drawable/widget_small_green.xml
similarity index 100%
rename from app/src/main/res/drawable/widget_small_green.xml
rename to widget/src/main/res/drawable/widget_small_green.xml
diff --git a/widget/src/test/java/com/no5ing/bbibbi/widget/ExampleUnitTest.kt b/widget/src/test/java/com/no5ing/bbibbi/widget/ExampleUnitTest.kt
new file mode 100644
index 0000000..0130b7b
--- /dev/null
+++ b/widget/src/test/java/com/no5ing/bbibbi/widget/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.no5ing.bbibbi.widget
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file