diff --git a/app/src/main/kotlin/de/justjanne/quasseldroid/ui/components/MessageBase.kt b/app/src/main/kotlin/de/justjanne/quasseldroid/ui/components/MessageBase.kt
index 762d969a16955ea99549f9ddc86734cc1e10a8b3..f43b50fda6eed005d891c7b565af38cb83daf38a 100644
--- a/app/src/main/kotlin/de/justjanne/quasseldroid/ui/components/MessageBase.kt
+++ b/app/src/main/kotlin/de/justjanne/quasseldroid/ui/components/MessageBase.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.paddingFrom
 import androidx.compose.foundation.layout.paddingFromBaseline
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.ContentAlpha
@@ -17,12 +16,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.FirstBaseline
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -33,7 +30,7 @@ import de.justjanne.quasseldroid.sample.SampleMessageProvider
 import de.justjanne.quasseldroid.ui.icons.AvatarIcon
 import de.justjanne.quasseldroid.ui.theme.QuasselTheme
 import de.justjanne.quasseldroid.ui.theme.Typography
-import irc.SenderColorUtil
+import de.justjanne.quasseldroid.util.irc.SenderColorUtil
 import org.threeten.bp.ZoneId
 import org.threeten.bp.format.DateTimeFormatter
 import org.threeten.bp.format.FormatStyle
diff --git a/app/src/main/kotlin/de/justjanne/quasseldroid/ui/icons/AvatarIcon.kt b/app/src/main/kotlin/de/justjanne/quasseldroid/ui/icons/AvatarIcon.kt
index 06087cf398b23e8bb6ff2cd81e900bc435a880d7..6134f07b677bef414eae153bb2246b42ca2d8d20 100644
--- a/app/src/main/kotlin/de/justjanne/quasseldroid/ui/icons/AvatarIcon.kt
+++ b/app/src/main/kotlin/de/justjanne/quasseldroid/ui/icons/AvatarIcon.kt
@@ -2,7 +2,6 @@ package de.justjanne.quasseldroid.ui.icons
 
 import android.graphics.Bitmap
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ContentAlpha
@@ -21,7 +20,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import de.justjanne.quasseldroid.sample.SampleNickProvider
 import de.justjanne.quasseldroid.ui.theme.QuasselTheme
-import irc.SenderColorUtil
+import de.justjanne.quasseldroid.util.irc.SenderColorUtil
 import java.util.*
 
 @Preview
diff --git a/app/src/main/kotlin/irc/CRCUtils.kt b/app/src/main/kotlin/de/justjanne/quasseldroid/util/irc/CRCUtils.kt
similarity index 95%
rename from app/src/main/kotlin/irc/CRCUtils.kt
rename to app/src/main/kotlin/de/justjanne/quasseldroid/util/irc/CRCUtils.kt
index 494d9fa0c8266b13aad95502ea947e6453704d8f..1ab65e9430682fcacd882c859cf0c07c118b820c 100644
--- a/app/src/main/kotlin/irc/CRCUtils.kt
+++ b/app/src/main/kotlin/de/justjanne/quasseldroid/util/irc/CRCUtils.kt
@@ -1,4 +1,4 @@
-package irc
+package de.justjanne.quasseldroid.util.irc
 
 object CRCUtils {
   fun qChecksum(data: ByteArray): Int {
diff --git a/app/src/main/kotlin/irc/SenderColorUtil.kt b/app/src/main/kotlin/de/justjanne/quasseldroid/util/irc/SenderColorUtil.kt
similarity index 84%
rename from app/src/main/kotlin/irc/SenderColorUtil.kt
rename to app/src/main/kotlin/de/justjanne/quasseldroid/util/irc/SenderColorUtil.kt
index 6b12a9ced4e0686436d5c8a1f4273578aee00db1..fc37a5471e3f25537ec14fa0071ce4b57ac20d73 100644
--- a/app/src/main/kotlin/irc/SenderColorUtil.kt
+++ b/app/src/main/kotlin/de/justjanne/quasseldroid/util/irc/SenderColorUtil.kt
@@ -1,4 +1,4 @@
-package irc
+package de.justjanne.quasseldroid.util.irc
 
 import java.util.*
 
diff --git a/app/src/test/kotlin/de/kuschku/justjanne/quasseldroid/util/irc/SenderColorUtilTest.kt b/app/src/test/kotlin/de/kuschku/justjanne/quasseldroid/util/irc/SenderColorUtilTest.kt
index e26136bb1c371cb5b6a3555807ed74ad953f901e..7c94ce20edd092f0212bb5b49ac568baa209a8d2 100644
--- a/app/src/test/kotlin/de/kuschku/justjanne/quasseldroid/util/irc/SenderColorUtilTest.kt
+++ b/app/src/test/kotlin/de/kuschku/justjanne/quasseldroid/util/irc/SenderColorUtilTest.kt
@@ -1,6 +1,6 @@
 package de.kuschku.justjanne.quasseldroid.util.irc
 
-import irc.SenderColorUtil
+import de.justjanne.quasseldroid.util.irc.SenderColorUtil
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test