diff --git a/app/src/main/java/com/hako/friendlists/MainApplication.kt b/app/src/main/java/com/hako/friendlists/MainApplication.kt
index 0b5aa8e..92db1b3 100644
--- a/app/src/main/java/com/hako/friendlists/MainApplication.kt
+++ b/app/src/main/java/com/hako/friendlists/MainApplication.kt
@@ -1,7 +1,7 @@
 package com.hako.friendlists
 
 import android.app.Application
-import com.hako.friendlist.di.userlistModules
+import com.hako.userlist.di.userlistModules
 import com.hako.friendlists.di.appModules
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
diff --git a/userlist/src/main/java/com/hako/friendlist/di/UserlistModules.kt b/userlist/src/main/java/com/hako/userlist/di/UserlistModules.kt
similarity index 56%
rename from userlist/src/main/java/com/hako/friendlist/di/UserlistModules.kt
rename to userlist/src/main/java/com/hako/userlist/di/UserlistModules.kt
index ccb1b20..a69b104 100644
--- a/userlist/src/main/java/com/hako/friendlist/di/UserlistModules.kt
+++ b/userlist/src/main/java/com/hako/userlist/di/UserlistModules.kt
@@ -1,10 +1,10 @@
-package com.hako.friendlist.di
+package com.hako.userlist.di
 
 import com.hako.base.domain.network.RemoteClient
-import com.hako.friendlist.domain.datasource.UserlistDatasource
-import com.hako.friendlist.domain.datasource.UserlistRemoteApi
-import com.hako.friendlist.domain.usecase.GetUsers
-import com.hako.friendlist.viewmodel.UserlistViewmodel
+import com.hako.userlist.domain.datasource.UserlistDatasource
+import com.hako.userlist.domain.datasource.UserlistRemoteApi
+import com.hako.userlist.domain.usecase.GetUsers
+import com.hako.userlist.viewmodel.UserlistViewmodel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 
diff --git a/userlist/src/main/java/com/hako/friendlist/domain/datasource/UserlistDatasource.kt b/userlist/src/main/java/com/hako/userlist/domain/datasource/UserlistDatasource.kt
similarity index 76%
rename from userlist/src/main/java/com/hako/friendlist/domain/datasource/UserlistDatasource.kt
rename to userlist/src/main/java/com/hako/userlist/domain/datasource/UserlistDatasource.kt
index b7ebfa2..c9a6710 100644
--- a/userlist/src/main/java/com/hako/friendlist/domain/datasource/UserlistDatasource.kt
+++ b/userlist/src/main/java/com/hako/userlist/domain/datasource/UserlistDatasource.kt
@@ -1,6 +1,6 @@
-package com.hako.friendlist.domain.datasource
+package com.hako.userlist.domain.datasource
 
-import com.hako.friendlist.model.User
+import com.hako.userlist.model.User
 import io.reactivex.Single
 import org.koin.core.KoinComponent
 import org.koin.core.get
diff --git a/userlist/src/main/java/com/hako/friendlist/domain/datasource/UserlistRemoteApi.kt b/userlist/src/main/java/com/hako/userlist/domain/datasource/UserlistRemoteApi.kt
similarity index 63%
rename from userlist/src/main/java/com/hako/friendlist/domain/datasource/UserlistRemoteApi.kt
rename to userlist/src/main/java/com/hako/userlist/domain/datasource/UserlistRemoteApi.kt
index 00ff807..8ffd5b5 100644
--- a/userlist/src/main/java/com/hako/friendlist/domain/datasource/UserlistRemoteApi.kt
+++ b/userlist/src/main/java/com/hako/userlist/domain/datasource/UserlistRemoteApi.kt
@@ -1,6 +1,6 @@
-package com.hako.friendlist.domain.datasource
+package com.hako.userlist.domain.datasource
 
-import com.hako.friendlist.model.User
+import com.hako.userlist.model.User
 import io.reactivex.Single
 import retrofit2.http.GET
 
diff --git a/userlist/src/main/java/com/hako/friendlist/domain/usecase/GetUsers.kt b/userlist/src/main/java/com/hako/userlist/domain/usecase/GetUsers.kt
similarity index 84%
rename from userlist/src/main/java/com/hako/friendlist/domain/usecase/GetUsers.kt
rename to userlist/src/main/java/com/hako/userlist/domain/usecase/GetUsers.kt
index bf5e094..939394d 100644
--- a/userlist/src/main/java/com/hako/friendlist/domain/usecase/GetUsers.kt
+++ b/userlist/src/main/java/com/hako/userlist/domain/usecase/GetUsers.kt
@@ -1,11 +1,11 @@
-package com.hako.friendlist.domain.usecase
+package com.hako.userlist.domain.usecase
 
 import com.hako.base.domain.UseCase
 import com.hako.base.domain.database.dao.UserDao
-import com.hako.friendlist.domain.datasource.UserlistDatasource
-import com.hako.friendlist.model.UserViewable
-import com.hako.friendlist.model.toUserEntity
-import com.hako.friendlist.model.toUserViewable
+import com.hako.userlist.domain.datasource.UserlistDatasource
+import com.hako.userlist.model.UserViewable
+import com.hako.userlist.model.toUserEntity
+import com.hako.userlist.model.toUserViewable
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
 import org.koin.core.KoinComponent
diff --git a/userlist/src/main/java/com/hako/friendlist/feature/UserlistFragment.kt b/userlist/src/main/java/com/hako/userlist/feature/UserlistFragment.kt
similarity index 92%
rename from userlist/src/main/java/com/hako/friendlist/feature/UserlistFragment.kt
rename to userlist/src/main/java/com/hako/userlist/feature/UserlistFragment.kt
index 9d2f4c3..08f15e7 100644
--- a/userlist/src/main/java/com/hako/friendlist/feature/UserlistFragment.kt
+++ b/userlist/src/main/java/com/hako/userlist/feature/UserlistFragment.kt
@@ -1,4 +1,4 @@
-package com.hako.friendlist.feature
+package com.hako.userlist.feature
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -9,9 +9,9 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.hako.base.domain.network.RequestStatus
 import com.hako.base.extensions.observeNonNull
 import com.hako.base.extensions.toast
-import com.hako.friendlist.model.UserViewable
-import com.hako.friendlist.viewmodel.UserlistViewmodel
-import com.hako.friendlist.widget.UserlistAdapter
+import com.hako.userlist.model.UserViewable
+import com.hako.userlist.viewmodel.UserlistViewmodel
+import com.hako.userlist.widget.UserlistAdapter
 import com.hako.friendlist_userlist.R
 import kotlinx.android.synthetic.main.fragment_userlist.*
 import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/userlist/src/main/java/com/hako/friendlist/model/UserModels.kt b/userlist/src/main/java/com/hako/userlist/model/UserModels.kt
similarity index 96%
rename from userlist/src/main/java/com/hako/friendlist/model/UserModels.kt
rename to userlist/src/main/java/com/hako/userlist/model/UserModels.kt
index 5dfa108..b89a2aa 100644
--- a/userlist/src/main/java/com/hako/friendlist/model/UserModels.kt
+++ b/userlist/src/main/java/com/hako/userlist/model/UserModels.kt
@@ -1,4 +1,4 @@
-package com.hako.friendlist.model
+package com.hako.userlist.model
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
diff --git a/userlist/src/main/java/com/hako/friendlist/viewmodel/UserlistViewmodel.kt b/userlist/src/main/java/com/hako/userlist/viewmodel/UserlistViewmodel.kt
similarity index 88%
rename from userlist/src/main/java/com/hako/friendlist/viewmodel/UserlistViewmodel.kt
rename to userlist/src/main/java/com/hako/userlist/viewmodel/UserlistViewmodel.kt
index dd6b938..abe56e5 100644
--- a/userlist/src/main/java/com/hako/friendlist/viewmodel/UserlistViewmodel.kt
+++ b/userlist/src/main/java/com/hako/userlist/viewmodel/UserlistViewmodel.kt
@@ -1,4 +1,4 @@
-package com.hako.friendlist.viewmodel
+package com.hako.userlist.viewmodel
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -7,8 +7,8 @@ import com.hako.base.domain.network.RequestStatus.Ready
 import com.hako.base.domain.network.RequestStatus.Loading
 import com.hako.base.domain.network.RequestStatus.Errored
 import com.hako.base.domain.Either
-import com.hako.friendlist.domain.usecase.GetUsers
-import com.hako.friendlist.model.UserViewable
+import com.hako.userlist.domain.usecase.GetUsers
+import com.hako.userlist.model.UserViewable
 import org.koin.core.KoinComponent
 import org.koin.core.get
 
diff --git a/userlist/src/main/java/com/hako/friendlist/widget/UserlistAdapter.kt b/userlist/src/main/java/com/hako/userlist/widget/UserlistAdapter.kt
similarity index 96%
rename from userlist/src/main/java/com/hako/friendlist/widget/UserlistAdapter.kt
rename to userlist/src/main/java/com/hako/userlist/widget/UserlistAdapter.kt
index a6bfe05..3a5294e 100644
--- a/userlist/src/main/java/com/hako/friendlist/widget/UserlistAdapter.kt
+++ b/userlist/src/main/java/com/hako/userlist/widget/UserlistAdapter.kt
@@ -1,11 +1,11 @@
-package com.hako.friendlist.widget
+package com.hako.userlist.widget
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.hako.base.extensions.autoNotify
-import com.hako.friendlist.model.UserViewable
+import com.hako.userlist.model.UserViewable
 import com.hako.friendlist_userlist.R
 import kotlinx.android.synthetic.main.item_user_card.view.*
 import kotlin.properties.Delegates
diff --git a/userlist/src/main/res/navigation/userlist_navigation.xml b/userlist/src/main/res/navigation/userlist_navigation.xml
index 2343782..20c9258 100644
--- a/userlist/src/main/res/navigation/userlist_navigation.xml
+++ b/userlist/src/main/res/navigation/userlist_navigation.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/userListFragment"
-        android:name="com.hako.friendlist.feature.UserlistFragment"
+        android:name="com.hako.userlist.feature.UserlistFragment"
         tools:layout="@layout/fragment_userlist"
         android:label="UserListFragment" />