diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
index cb9f403eff..b56844c4c8 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
@@ -32,6 +32,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentLocationSharingBinding
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
+import im.vector.app.features.location.option.LocationSharingOption
 import org.matrix.android.sdk.api.util.MatrixItem
 import java.lang.ref.WeakReference
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingOption.kt b/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOption.kt
similarity index 94%
rename from vector/src/main/java/im/vector/app/features/location/LocationSharingOption.kt
rename to vector/src/main/java/im/vector/app/features/location/option/LocationSharingOption.kt
index 38f4bff16e..7d7cf29225 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingOption.kt
+++ b/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOption.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.location
+package im.vector.app.features.location.option
 
 enum class LocationSharingOption {
     USER_CURRENT, // current user's location
diff --git a/vector/src/main/java/im/vector/app/features/location/view/LocationSharingOptionPickerView.kt b/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionPickerView.kt
similarity index 95%
rename from vector/src/main/java/im/vector/app/features/location/view/LocationSharingOptionPickerView.kt
rename to vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionPickerView.kt
index 1e863e6fb0..ffd80742b2 100644
--- a/vector/src/main/java/im/vector/app/features/location/view/LocationSharingOptionPickerView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionPickerView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.location.view
+package im.vector.app.features.location.option
 
 import android.content.Context
 import android.util.AttributeSet
@@ -23,7 +23,6 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isVisible
 import im.vector.app.databinding.ViewLocationSharingOptionPickerBinding
-import im.vector.app.features.location.LocationSharingOption
 
 /**
  * Custom view to display the location sharing option picker.
diff --git a/vector/src/main/java/im/vector/app/features/location/view/LocationSharingOptionView.kt b/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionView.kt
similarity index 98%
rename from vector/src/main/java/im/vector/app/features/location/view/LocationSharingOptionView.kt
rename to vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionView.kt
index b19b2cdc81..4041b7d7f5 100644
--- a/vector/src/main/java/im/vector/app/features/location/view/LocationSharingOptionView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.location.view
+package im.vector.app.features.location.option
 
 import android.content.Context
 import android.content.res.TypedArray
diff --git a/vector/src/main/res/layout/fragment_location_sharing.xml b/vector/src/main/res/layout/fragment_location_sharing.xml
index b2279ed146..3d07e4438d 100644
--- a/vector/src/main/res/layout/fragment_location_sharing.xml
+++ b/vector/src/main/res/layout/fragment_location_sharing.xml
@@ -14,7 +14,7 @@
         app:mapbox_renderTextureMode="true"
         tools:background="#4F00" />
 
-    <im.vector.app.features.location.view.LocationSharingOptionPickerView
+    <im.vector.app.features.location.option.LocationSharingOptionPickerView
         android:id="@+id/shareLocationOptionsPicker"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/view_location_sharing_option_picker.xml b/vector/src/main/res/layout/view_location_sharing_option_picker.xml
index ea1d4369ab..5b88a641d1 100644
--- a/vector/src/main/res/layout/view_location_sharing_option_picker.xml
+++ b/vector/src/main/res/layout/view_location_sharing_option_picker.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
-    <im.vector.app.features.location.view.LocationSharingOptionView
+    <im.vector.app.features.location.option.LocationSharingOptionView
         android:id="@+id/locationSharingOptionPinned"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/locationSharingOptionPinned" />
 
-    <im.vector.app.features.location.view.LocationSharingOptionView
+    <im.vector.app.features.location.option.LocationSharingOptionView
         android:id="@+id/locationSharingOptionUserCurrent"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/locationSharingOptionUserCurrent" />
 
-    <im.vector.app.features.location.view.LocationSharingOptionView
+    <im.vector.app.features.location.option.LocationSharingOptionView
         android:id="@+id/locationSharingOptionUserLive"
         android:layout_width="0dp"
         android:layout_height="wrap_content"