diff --git a/api/src/main/kotlin/dev/msfjarvis/claw/api/LobstersApi.kt b/api/src/main/kotlin/dev/msfjarvis/claw/api/LobstersApi.kt
index 83eb5fc0..78f10a55 100644
--- a/api/src/main/kotlin/dev/msfjarvis/claw/api/LobstersApi.kt
+++ b/api/src/main/kotlin/dev/msfjarvis/claw/api/LobstersApi.kt
@@ -7,9 +7,9 @@
 package dev.msfjarvis.claw.api
 
 import com.slack.eithernet.ApiResult
-import dev.msfjarvis.claw.api.util.Tags
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.LobstersPostDetails
+import dev.msfjarvis.claw.model.Tags
 import dev.msfjarvis.claw.model.User
 import retrofit2.http.GET
 import retrofit2.http.Path
diff --git a/api/src/test/kotlin/dev/msfjarvis/claw/api/ApiTest.kt b/api/src/test/kotlin/dev/msfjarvis/claw/api/ApiTest.kt
index 3c9de96d..8d6c8bd4 100644
--- a/api/src/test/kotlin/dev/msfjarvis/claw/api/ApiTest.kt
+++ b/api/src/test/kotlin/dev/msfjarvis/claw/api/ApiTest.kt
@@ -8,9 +8,9 @@ package dev.msfjarvis.claw.api
 
 import com.slack.eithernet.ApiResult.Success
 import com.slack.eithernet.test.newEitherNetController
-import dev.msfjarvis.claw.api.util.Tags
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.LobstersPostDetails
+import dev.msfjarvis.claw.model.Tags
 import dev.msfjarvis.claw.model.User
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.collections.shouldHaveSize
diff --git a/detekt-baselines/api.xml b/detekt-baselines/model.xml
similarity index 51%
rename from detekt-baselines/api.xml
rename to detekt-baselines/model.xml
index 1a0c049d..8cb5e9f7 100644
--- a/detekt-baselines/api.xml
+++ b/detekt-baselines/model.xml
@@ -2,6 +2,6 @@
 <SmellBaseline>
   <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
-    <ID>MemberNameEqualsClassName:Tags.kt$Tags$private var tags: MutableList&lt;String&gt; = emptyList&lt;String&gt;().toMutableList()</ID>
+    <ID>MemberNameEqualsClassName:Tags.kt$Tags$private val tags = arrayListOf&lt;String&gt;()</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/api/src/main/kotlin/dev/msfjarvis/claw/api/util/Tags.kt b/model/src/main/kotlin/dev/msfjarvis/claw/model/Tags.kt
similarity index 68%
rename from api/src/main/kotlin/dev/msfjarvis/claw/api/util/Tags.kt
rename to model/src/main/kotlin/dev/msfjarvis/claw/model/Tags.kt
index 7ee08753..0ffb15f3 100644
--- a/api/src/main/kotlin/dev/msfjarvis/claw/api/util/Tags.kt
+++ b/model/src/main/kotlin/dev/msfjarvis/claw/model/Tags.kt
@@ -4,17 +4,17 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.claw.api.util
+package dev.msfjarvis.claw.model
 
 class Tags {
-  private var tags: MutableList<String> = emptyList<String>().toMutableList()
+  private val tags = arrayListOf<String>()
 
   fun addTag(tag: String) {
-    this.tags.add(tag)
+    tags.add(tag)
   }
 
   fun removeTag(tag: String) {
-    this.tags.remove(tag)
+    tags.remove(tag)
   }
 
   override fun toString(): String {