diff --git a/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt b/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt
index 24477eda0..8a41de877 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt
@@ -58,6 +58,7 @@ import org.oxycblt.auxio.music.Artist
 import org.oxycblt.auxio.music.Genre
 import org.oxycblt.auxio.music.Playlist
 import org.oxycblt.auxio.music.Song
+import org.oxycblt.auxio.musikr.cover.Cover
 import org.oxycblt.auxio.ui.MaterialFader
 import org.oxycblt.auxio.ui.UISettings
 import org.oxycblt.auxio.util.getAttrColorCompat
diff --git a/app/src/main/java/org/oxycblt/auxio/image/coil/Components.kt b/app/src/main/java/org/oxycblt/auxio/image/coil/Components.kt
index 2c3fdd594..ba2f632f1 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/coil/Components.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/coil/Components.kt
@@ -43,7 +43,7 @@ import kotlinx.coroutines.withContext
 import okio.FileSystem
 import okio.buffer
 import okio.source
-import org.oxycblt.auxio.image.Cover
+import org.oxycblt.auxio.musikr.cover.Cover
 import org.oxycblt.auxio.image.stack.CoverRetriever
 
 class CoverKeyer @Inject constructor() : Keyer<Cover> {
diff --git a/app/src/main/java/org/oxycblt/auxio/image/stack/CoverRetriever.kt b/app/src/main/java/org/oxycblt/auxio/image/stack/CoverRetriever.kt
index 102378e3d..e292f8ebf 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/stack/CoverRetriever.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/stack/CoverRetriever.kt
@@ -20,8 +20,8 @@ package org.oxycblt.auxio.image.stack
 
 import java.io.InputStream
 import javax.inject.Inject
-import org.oxycblt.auxio.image.Cover
-import org.oxycblt.auxio.image.stack.cache.CoverCache
+import org.oxycblt.auxio.musikr.cover.Cover
+import org.oxycblt.auxio.musikr.cover.CoverCache
 import org.oxycblt.auxio.image.stack.extractor.CoverExtractor
 import timber.log.Timber
 
diff --git a/app/src/main/java/org/oxycblt/auxio/image/stack/extractor/CoverExtractor.kt b/app/src/main/java/org/oxycblt/auxio/image/stack/extractor/CoverExtractor.kt
index d491e1780..22a3bead7 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/stack/extractor/CoverExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/stack/extractor/CoverExtractor.kt
@@ -20,7 +20,7 @@ package org.oxycblt.auxio.image.stack.extractor
 
 import android.net.Uri
 import javax.inject.Inject
-import org.oxycblt.auxio.image.Cover
+import org.oxycblt.auxio.musikr.cover.Cover
 
 interface CoverExtractor {
     suspend fun extract(cover: Cover.Single): ByteArray?
diff --git a/app/src/main/java/org/oxycblt/auxio/music/Music.kt b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
index f28b4afd4..d30de6dc6 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
@@ -27,7 +27,7 @@ import java.util.UUID
 import kotlin.math.max
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import org.oxycblt.auxio.image.Cover
+import org.oxycblt.auxio.musikr.cover.Cover
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.musikr.model.Date
 import org.oxycblt.auxio.musikr.model.Disc
diff --git a/app/src/main/java/org/oxycblt/auxio/image/stack/cache/CacheModule.kt b/app/src/main/java/org/oxycblt/auxio/musikr/cover/CacheModule.kt
similarity index 97%
rename from app/src/main/java/org/oxycblt/auxio/image/stack/cache/CacheModule.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/cover/CacheModule.kt
index ef7ce7c98..83c13e13d 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/stack/cache/CacheModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/cover/CacheModule.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.image.stack.cache
+package org.oxycblt.auxio.musikr.cover
 
 import android.content.Context
 import androidx.room.Room
diff --git a/app/src/main/java/org/oxycblt/auxio/image/Cover.kt b/app/src/main/java/org/oxycblt/auxio/musikr/cover/Cover.kt
similarity index 97%
rename from app/src/main/java/org/oxycblt/auxio/image/Cover.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/cover/Cover.kt
index 7950e755b..706bd5c67 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/Cover.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/cover/Cover.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.image
+package org.oxycblt.auxio.musikr.cover
 
 import org.oxycblt.auxio.list.sort.Sort
 import org.oxycblt.auxio.music.Song
diff --git a/app/src/main/java/org/oxycblt/auxio/image/stack/cache/CoverCache.kt b/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverCache.kt
similarity index 93%
rename from app/src/main/java/org/oxycblt/auxio/image/stack/cache/CoverCache.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverCache.kt
index 9c7dfb993..d5f16d0f5 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/stack/cache/CoverCache.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverCache.kt
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.image.stack.cache
+package org.oxycblt.auxio.musikr.cover
 
 import java.io.InputStream
 import javax.inject.Inject
-import org.oxycblt.auxio.image.Cover
 
 interface CoverCache {
     suspend fun read(cover: Cover.Single): InputStream?
@@ -45,7 +44,8 @@ constructor(
         val id = coverIdentifier.identify(data)
         coverFiles.write(id, data)
         storedCoversDao.setStoredCover(
-            StoredCover(uid = cover.uid, lastModified = cover.lastModified, coverId = id))
+            StoredCover(uid = cover.uid, lastModified = cover.lastModified, coverId = id)
+        )
         return coverFiles.read(id)
     }
 }
diff --git a/app/src/main/java/org/oxycblt/auxio/image/stack/cache/CoverFiles.kt b/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverFiles.kt
similarity index 98%
rename from app/src/main/java/org/oxycblt/auxio/image/stack/cache/CoverFiles.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverFiles.kt
index 9bb7beeae..39d729ed4 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/stack/cache/CoverFiles.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverFiles.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.image.stack.cache
+package org.oxycblt.auxio.musikr.cover
 
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
diff --git a/app/src/main/java/org/oxycblt/auxio/image/stack/cache/CoverFormat.kt b/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverFormat.kt
similarity index 98%
rename from app/src/main/java/org/oxycblt/auxio/image/stack/cache/CoverFormat.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverFormat.kt
index 06bfab973..a565ac3d5 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/stack/cache/CoverFormat.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverFormat.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.image.stack.cache
+package org.oxycblt.auxio.musikr.cover
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
diff --git a/app/src/main/java/org/oxycblt/auxio/image/stack/cache/CoverIdentifier.kt b/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverIdentifier.kt
similarity index 96%
rename from app/src/main/java/org/oxycblt/auxio/image/stack/cache/CoverIdentifier.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverIdentifier.kt
index 69ae53d60..75cb2bf7a 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/stack/cache/CoverIdentifier.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverIdentifier.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.image.stack.cache
+package org.oxycblt.auxio.musikr.cover
 
 import java.security.MessageDigest
 import javax.inject.Inject
diff --git a/app/src/main/java/org/oxycblt/auxio/image/stack/cache/StoredCoversDatabase.kt b/app/src/main/java/org/oxycblt/auxio/musikr/cover/StoredCoversDatabase.kt
similarity index 97%
rename from app/src/main/java/org/oxycblt/auxio/image/stack/cache/StoredCoversDatabase.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/cover/StoredCoversDatabase.kt
index 41651feab..fb03e29bb 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/stack/cache/StoredCoversDatabase.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/cover/StoredCoversDatabase.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.image.stack.cache
+package org.oxycblt.auxio.musikr.cover
 
 import androidx.room.Dao
 import androidx.room.Database
diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/explore/Explorer.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/Explorer.kt
index eb6d5618e..e87e57a22 100644
--- a/app/src/main/java/org/oxycblt/auxio/musikr/explore/Explorer.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/Explorer.kt
@@ -58,7 +58,6 @@ constructor(
     private val tagExtractor: TagExtractor,
     private val storedPlaylists: StoredPlaylists
 ) : Explorer {
-    @OptIn(ExperimentalCoroutinesApi::class)
     override fun explore(
         uris: List<Uri>,
         onProgress: suspend (IndexingProgress.Songs) -> Unit
diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/model/DeviceMusicImpl.kt b/app/src/main/java/org/oxycblt/auxio/musikr/model/DeviceMusicImpl.kt
index 3b0f18bf6..9dc28c5c4 100644
--- a/app/src/main/java/org/oxycblt/auxio/musikr/model/DeviceMusicImpl.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/model/DeviceMusicImpl.kt
@@ -19,7 +19,7 @@
 package org.oxycblt.auxio.musikr.model
 
 import kotlin.math.min
-import org.oxycblt.auxio.image.Cover
+import org.oxycblt.auxio.musikr.cover.Cover
 import org.oxycblt.auxio.list.sort.Sort
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Artist
diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/model/PlaylistImpl.kt b/app/src/main/java/org/oxycblt/auxio/musikr/model/PlaylistImpl.kt
index 5be72aa05..0a69eebee 100644
--- a/app/src/main/java/org/oxycblt/auxio/musikr/model/PlaylistImpl.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/model/PlaylistImpl.kt
@@ -18,7 +18,7 @@
  
 package org.oxycblt.auxio.musikr.model
 
-import org.oxycblt.auxio.image.Cover
+import org.oxycblt.auxio.musikr.cover.Cover
 import org.oxycblt.auxio.music.Playlist
 import org.oxycblt.auxio.musikr.interpret.link.LinkedPlaylist