diff --git a/core/src/main/java/org/futo/circles/core/feature/circles/filter/FilterTimelinesDataSource.kt b/core/src/main/java/org/futo/circles/core/feature/circles/filter/FilterTimelinesDataSource.kt
new file mode 100644
index 0000000000000000000000000000000000000000..228ccfe74a72479e5b30501d24a293376096b97e
--- /dev/null
+++ b/core/src/main/java/org/futo/circles/core/feature/circles/filter/FilterTimelinesDataSource.kt
@@ -0,0 +1,6 @@
+package org.futo.circles.core.feature.circles.filter
+
+import javax.inject.Inject
+
+class FilterTimelinesDataSource @Inject constructor() {
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/futo/circles/core/feature/circles/filter/FilterTimelinesDialogFragment.kt b/core/src/main/java/org/futo/circles/core/feature/circles/filter/FilterTimelinesDialogFragment.kt
new file mode 100644
index 0000000000000000000000000000000000000000..5ad59fcff3df58c50de9b017dd09607001be49cf
--- /dev/null
+++ b/core/src/main/java/org/futo/circles/core/feature/circles/filter/FilterTimelinesDialogFragment.kt
@@ -0,0 +1,12 @@
+package org.futo.circles.core.feature.circles.filter
+
+import dagger.hilt.android.AndroidEntryPoint
+import org.futo.circles.core.base.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.databinding.DialogFragmentFilterTimelineBinding
+
+
+@AndroidEntryPoint
+class FilterTimelinesDialogFragment :
+    BaseFullscreenDialogFragment(DialogFragmentFilterTimelineBinding::inflate) {
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/futo/circles/core/feature/circles/filter/FilterTimelinesViewModel.kt b/core/src/main/java/org/futo/circles/core/feature/circles/filter/FilterTimelinesViewModel.kt
new file mode 100644
index 0000000000000000000000000000000000000000..5e0bd522e16f5f22e5949fae5fd1e41e806452ea
--- /dev/null
+++ b/core/src/main/java/org/futo/circles/core/feature/circles/filter/FilterTimelinesViewModel.kt
@@ -0,0 +1,12 @@
+package org.futo.circles.core.feature.circles.filter
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class FilterTimelinesViewModel @Inject constructor(
+    private val dataSource: FilterTimelinesDataSource
+) : ViewModel() {
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/futo/circles/core/feature/room/circles/following/FollowingDataSource.kt b/core/src/main/java/org/futo/circles/core/feature/circles/following/FollowingDataSource.kt
similarity index 96%
rename from core/src/main/java/org/futo/circles/core/feature/room/circles/following/FollowingDataSource.kt
rename to core/src/main/java/org/futo/circles/core/feature/circles/following/FollowingDataSource.kt
index 56a80bd8ebdecc411092741849ffd3b072a27d76..b4a21210a0f106dad60ef9ff7c2d4692d1f21278 100644
--- a/core/src/main/java/org/futo/circles/core/feature/room/circles/following/FollowingDataSource.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/circles/following/FollowingDataSource.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.core.feature.room.circles.following
+package org.futo.circles.core.feature.circles.following
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.map
diff --git a/core/src/main/java/org/futo/circles/core/feature/room/circles/following/FollowingDialogFragment.kt b/core/src/main/java/org/futo/circles/core/feature/circles/following/FollowingDialogFragment.kt
similarity index 93%
rename from core/src/main/java/org/futo/circles/core/feature/room/circles/following/FollowingDialogFragment.kt
rename to core/src/main/java/org/futo/circles/core/feature/circles/following/FollowingDialogFragment.kt
index a4e567d41b73c6b20ebf45060413a49f8cae3b3c..7e5b78b15da0f7354aefc6efc57268f93aaea8ec 100644
--- a/core/src/main/java/org/futo/circles/core/feature/room/circles/following/FollowingDialogFragment.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/circles/following/FollowingDialogFragment.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.core.feature.room.circles.following
+package org.futo.circles.core.feature.circles.following
 
 import android.os.Bundle
 import android.view.View
@@ -9,7 +9,7 @@ import org.futo.circles.core.base.fragment.BaseFullscreenDialogFragment
 import org.futo.circles.core.databinding.DialogFragmentFollowingBinding
 import org.futo.circles.core.extensions.observeData
 import org.futo.circles.core.extensions.observeResponse
-import org.futo.circles.core.feature.room.circles.following.list.FollowingAdapter
+import org.futo.circles.core.feature.circles.following.list.FollowingAdapter
 import org.futo.circles.core.model.FollowingListItem
 
 @AndroidEntryPoint
diff --git a/core/src/main/java/org/futo/circles/core/feature/room/circles/following/FollowingViewModel.kt b/core/src/main/java/org/futo/circles/core/feature/circles/following/FollowingViewModel.kt
similarity index 93%
rename from core/src/main/java/org/futo/circles/core/feature/room/circles/following/FollowingViewModel.kt
rename to core/src/main/java/org/futo/circles/core/feature/circles/following/FollowingViewModel.kt
index 875a1dcba4424d96471e7ac8eb9d609ec4a7ec68..07e11a5602ab0d25a9972d136b877ae93b7c398e 100644
--- a/core/src/main/java/org/futo/circles/core/feature/room/circles/following/FollowingViewModel.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/circles/following/FollowingViewModel.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.core.feature.room.circles.following
+package org.futo.circles.core.feature.circles.following
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/core/src/main/java/org/futo/circles/core/feature/room/circles/following/RemoveFollowingDialog.kt b/core/src/main/java/org/futo/circles/core/feature/circles/following/RemoveFollowingDialog.kt
similarity index 95%
rename from core/src/main/java/org/futo/circles/core/feature/room/circles/following/RemoveFollowingDialog.kt
rename to core/src/main/java/org/futo/circles/core/feature/circles/following/RemoveFollowingDialog.kt
index 3cba96f49fa1646fd521252de6379137e8cd2dbb..54deb05ef989b35d8994ace3bb83e527aef1dd56 100644
--- a/core/src/main/java/org/futo/circles/core/feature/room/circles/following/RemoveFollowingDialog.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/circles/following/RemoveFollowingDialog.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.core.feature.room.circles.following
+package org.futo.circles.core.feature.circles.following
 
 import android.content.Context
 import android.os.Bundle
diff --git a/core/src/main/java/org/futo/circles/core/feature/room/circles/following/list/FollowingAdapter.kt b/core/src/main/java/org/futo/circles/core/feature/circles/following/list/FollowingAdapter.kt
similarity index 91%
rename from core/src/main/java/org/futo/circles/core/feature/room/circles/following/list/FollowingAdapter.kt
rename to core/src/main/java/org/futo/circles/core/feature/circles/following/list/FollowingAdapter.kt
index b4f8e2e34a715690ffd036844e0138b47b17e2cb..6f51170bc86dfcc3203aa582c7242ff01857f128 100644
--- a/core/src/main/java/org/futo/circles/core/feature/room/circles/following/list/FollowingAdapter.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/circles/following/list/FollowingAdapter.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.core.feature.room.circles.following.list
+package org.futo.circles.core.feature.circles.following.list
 
 import android.view.ViewGroup
 import org.futo.circles.core.base.list.BaseRvAdapter
diff --git a/core/src/main/java/org/futo/circles/core/feature/room/circles/following/list/FollowingViewHolder.kt b/core/src/main/java/org/futo/circles/core/feature/circles/following/list/FollowingViewHolder.kt
similarity index 95%
rename from core/src/main/java/org/futo/circles/core/feature/room/circles/following/list/FollowingViewHolder.kt
rename to core/src/main/java/org/futo/circles/core/feature/circles/following/list/FollowingViewHolder.kt
index 5cac6fd53f8658c7de46e8e9fcbc43c11a8d6178..9532daa5cdc8e67077939d0a5b42166f654f8b97 100644
--- a/core/src/main/java/org/futo/circles/core/feature/room/circles/following/list/FollowingViewHolder.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/circles/following/list/FollowingViewHolder.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.core.feature.room.circles.following.list
+package org.futo.circles.core.feature.circles.following.list
 
 import android.text.format.DateUtils
 import android.view.ViewGroup