diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/FollowSet.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/FollowSet.kt
new file mode 100644
index 000000000..af9ac5374
--- /dev/null
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/FollowSet.kt
@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.ui.screen.loggedIn.lists
+
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.quartz.events.PeopleListEvent
+import com.vitorpamplona.quartz.signers.NostrSigner
+
+@Stable
+class FollowSet(
+    val isPrivate: Boolean,
+    val title: String,
+    val description: String?,
+    val profileList: Set<String>,
+) {
+    companion object {
+        fun mapEventToSet(
+            event: PeopleListEvent,
+            signer: NostrSigner,
+        ): FollowSet {
+            val dTag = event.dTag()
+            val listTitle = event.title() ?: dTag
+            val listDescription = event.description() ?: ""
+            val publicFollows = event.filterTagList("p", null)
+            val privateFollows = mutableListOf<String>()
+            event.privateTaggedUsers(signer) { userList -> privateFollows.addAll(userList) }
+            return if (publicFollows.isEmpty() && privateFollows.isNotEmpty()) {
+                FollowSet(
+                    isPrivate = true,
+                    title = listTitle,
+                    description = listDescription,
+                    profileList = privateFollows.toSet(),
+                )
+            } else if (publicFollows.isNotEmpty() && privateFollows.isEmpty()) {
+                FollowSet(
+                    isPrivate = false,
+                    title = listTitle,
+                    description = listDescription,
+                    profileList = publicFollows.toSet(),
+                )
+            } else {
+                throw Exception("Mixed follow sets are not yet supported.")
+            }
+        }
+    }
+}
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/PeopleListEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/PeopleListEvent.kt
index 4fe42f8d5..066822565 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/PeopleListEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/PeopleListEvent.kt
@@ -21,7 +21,6 @@
 package com.vitorpamplona.quartz.events
 
 import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.Stable
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.signers.NostrSigner
 import com.vitorpamplona.quartz.utils.TimeUtils
@@ -77,45 +76,6 @@ class PeopleListEvent(
         }
     }
 
-    @Stable
-    class FollowSet(
-        val isPrivate: Boolean,
-        val title: String,
-        val description: String?,
-        val profileList: Set<String>,
-    ) {
-        companion object {
-            fun mapEventToSet(
-                event: PeopleListEvent,
-                signer: NostrSigner,
-            ): FollowSet {
-                val dTag = event.dTag()
-                val listTitle = event.title() ?: dTag
-                val listDescription = event.description() ?: ""
-                val publicFollows = event.filterTagList("p", null)
-                val privateFollows = mutableListOf<String>()
-                event.privateTaggedUsers(signer) { userList -> privateFollows.addAll(userList) }
-                return if (publicFollows.isEmpty() && privateFollows.isNotEmpty()) {
-                    FollowSet(
-                        isPrivate = true,
-                        title = listTitle,
-                        description = listDescription,
-                        profileList = privateFollows.toSet(),
-                    )
-                } else if (publicFollows.isNotEmpty() && privateFollows.isEmpty()) {
-                    FollowSet(
-                        isPrivate = false,
-                        title = listTitle,
-                        description = listDescription,
-                        profileList = publicFollows.toSet(),
-                    )
-                } else {
-                    throw Exception("Mixed follow sets are not yet supported.")
-                }
-            }
-        }
-    }
-
     @Immutable
     class UsersAndWords(
         val users: Set<String> = setOf(),