diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index ed9800b4f7..922d4ca292 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -327,7 +327,7 @@
         <activity android:name=".features.settings.devices.v2.details.SessionDetailsActivity" />
         <activity android:name=".features.settings.devices.v2.rename.RenameSessionActivity" />
         <activity android:name=".features.login.qr.QrCodeLoginActivity" />
-        <activity android:name=".features.roomprofile.polls.detail.RoomPollDetailActivity" />
+        <activity android:name=".features.roomprofile.polls.detail.ui.RoomPollDetailActivity" />
 
         <!-- Services -->
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetail.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetail.kt
similarity index 94%
rename from vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetail.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetail.kt
index c149daaef2..cbbd09f065 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetail.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetail.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.roomprofile.polls.detail
+package im.vector.app.features.roomprofile.polls.detail.ui
 
 import im.vector.app.features.home.room.detail.timeline.item.PollOptionViewState
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailAction.kt
similarity index 92%
rename from vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailAction.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailAction.kt
index 58a059b7a5..efb20f9144 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailAction.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.roomprofile.polls.detail
+package im.vector.app.features.roomprofile.polls.detail.ui
 
 import im.vector.app.core.platform.VectorViewModelAction
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailActivity.kt
similarity index 95%
rename from vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailActivity.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailActivity.kt
index 6995340a9e..90090f7830 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 New Vector Ltd
+ * Copyright (c) 2023 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.roomprofile.polls.detail
+package im.vector.app.features.roomprofile.polls.detail.ui
 
 import android.content.Context
 import android.content.Intent
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailController.kt
similarity index 87%
rename from vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailController.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailController.kt
index cd2ca1c711..08db09a5b0 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailController.kt
@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.roomprofile.polls.detail
+package im.vector.app.features.roomprofile.polls.detail.ui
 
 import com.airbnb.epoxy.TypedEpoxyController
 import im.vector.app.features.home.room.detail.timeline.item.PollItem_
-import im.vector.app.features.roomprofile.polls.RoomPollsViewState
-import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
 import javax.inject.Inject
 
 class RoomPollDetailController @Inject constructor()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailFragment.kt
similarity index 97%
rename from vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailFragment.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailFragment.kt
index 3027f30460..a3ff6e0451 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.roomprofile.polls.detail
+package im.vector.app.features.roomprofile.polls.detail.ui
 
 import android.os.Bundle
 import android.os.Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailViewEvent.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailViewEvent.kt
similarity index 92%
rename from vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailViewEvent.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailViewEvent.kt
index 1ee405e0c3..01fb4698fb 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailViewEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailViewEvent.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.roomprofile.polls.detail
+package im.vector.app.features.roomprofile.polls.detail.ui
 
 import im.vector.app.core.platform.VectorViewEvents
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailViewModel.kt
similarity index 95%
rename from vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailViewModel.kt
index 7368d28c8f..a186ca3b3b 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.roomprofile.polls.detail
+package im.vector.app.features.roomprofile.polls.detail.ui
 
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailViewState.kt
similarity index 93%
rename from vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailViewState.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailViewState.kt
index 2d7303f555..6a68cdeb01 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/RoomPollDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.roomprofile.polls.detail
+package im.vector.app.features.roomprofile.polls.detail.ui
 
 import com.airbnb.mvrx.MavericksState
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/ui/RoomPollsListNavigator.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/ui/RoomPollsListNavigator.kt
index 35440e89a9..f04c9bf601 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/ui/RoomPollsListNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/ui/RoomPollsListNavigator.kt
@@ -17,7 +17,7 @@
 package im.vector.app.features.roomprofile.polls.list.ui
 
 import android.content.Context
-import im.vector.app.features.roomprofile.polls.detail.RoomPollDetailActivity
+import im.vector.app.features.roomprofile.polls.detail.ui.RoomPollDetailActivity
 import javax.inject.Inject
 
 // TODO add unit tests