diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
index 2f4fe0bee..de34e5f7f 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
@@ -66,7 +66,7 @@ import org.oxycblt.auxio.music.Playlist
 import org.oxycblt.auxio.music.PlaylistDecision
 import org.oxycblt.auxio.music.PlaylistMessage
 import org.oxycblt.auxio.music.external.M3U
-import org.oxycblt.auxio.music.stack.IndexingProgress
+import org.oxycblt.auxio.musikr.IndexingProgress
 import org.oxycblt.auxio.playback.PlaybackDecision
 import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.util.collect
diff --git a/app/src/main/java/org/oxycblt/auxio/music/Indexing.kt b/app/src/main/java/org/oxycblt/auxio/music/Indexing.kt
index db12863ec..ccad505d5 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/Indexing.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/Indexing.kt
@@ -19,7 +19,7 @@
 package org.oxycblt.auxio.music
 
 import android.os.Build
-import org.oxycblt.auxio.music.stack.IndexingProgress
+import org.oxycblt.auxio.musikr.IndexingProgress
 
 /** Version-aware permission identifier for reading audio files. */
 val PERMISSION_READ_AUDIO =
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 3e67706e3..272f34463 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
@@ -33,8 +33,8 @@ import org.oxycblt.auxio.music.info.Date
 import org.oxycblt.auxio.music.info.Disc
 import org.oxycblt.auxio.music.info.Name
 import org.oxycblt.auxio.music.info.ReleaseType
-import org.oxycblt.auxio.music.stack.explore.fs.MimeType
-import org.oxycblt.auxio.music.stack.explore.fs.Path
+import org.oxycblt.auxio.musikr.explore.fs.MimeType
+import org.oxycblt.auxio.musikr.explore.fs.Path
 import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
 import org.oxycblt.auxio.util.concatLocalized
 import org.oxycblt.auxio.util.toUuidOrNull
diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
index 697c68efc..33eebd8c0 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
@@ -27,10 +27,10 @@ import kotlinx.coroutines.yield
 import org.oxycblt.auxio.music.MusicRepository.IndexingWorker
 import org.oxycblt.auxio.music.info.Name
 import org.oxycblt.auxio.music.metadata.Separators
-import org.oxycblt.auxio.music.stack.Indexer
-import org.oxycblt.auxio.music.stack.IndexingProgress
-import org.oxycblt.auxio.music.stack.interpret.Interpretation
-import org.oxycblt.auxio.music.stack.interpret.model.MutableLibrary
+import org.oxycblt.auxio.musikr.Indexer
+import org.oxycblt.auxio.musikr.IndexingProgress
+import org.oxycblt.auxio.musikr.interpret.Interpretation
+import org.oxycblt.auxio.musikr.interpret.model.MutableLibrary
 import timber.log.Timber as L
 
 /**
diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt
index c3805f9cd..5b26c54ae 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt
@@ -24,7 +24,7 @@ import androidx.core.content.edit
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.music.stack.explore.fs.DocumentPathFactory
+import org.oxycblt.auxio.musikr.explore.fs.DocumentPathFactory
 import org.oxycblt.auxio.settings.Settings
 import timber.log.Timber as L
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/external/ExternalPlaylistManager.kt b/app/src/main/java/org/oxycblt/auxio/music/external/ExternalPlaylistManager.kt
index 0281ddb7c..9cae2c483 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/external/ExternalPlaylistManager.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/external/ExternalPlaylistManager.kt
@@ -23,10 +23,10 @@ import android.net.Uri
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import org.oxycblt.auxio.music.Playlist
-import org.oxycblt.auxio.music.stack.explore.fs.Components
-import org.oxycblt.auxio.music.stack.explore.fs.DocumentPathFactory
-import org.oxycblt.auxio.music.stack.explore.fs.Path
-import org.oxycblt.auxio.music.stack.explore.fs.contentResolverSafe
+import org.oxycblt.auxio.musikr.explore.fs.Components
+import org.oxycblt.auxio.musikr.explore.fs.DocumentPathFactory
+import org.oxycblt.auxio.musikr.explore.fs.Path
+import org.oxycblt.auxio.musikr.explore.fs.contentResolverSafe
 import timber.log.Timber as L
 
 /**
diff --git a/app/src/main/java/org/oxycblt/auxio/music/external/M3U.kt b/app/src/main/java/org/oxycblt/auxio/music/external/M3U.kt
index 6f8ad1c86..c4447afec 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/external/M3U.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/external/M3U.kt
@@ -28,11 +28,11 @@ import java.io.OutputStream
 import javax.inject.Inject
 import org.oxycblt.auxio.music.Playlist
 import org.oxycblt.auxio.music.resolveNames
-import org.oxycblt.auxio.music.stack.explore.extractor.correctWhitespace
-import org.oxycblt.auxio.music.stack.explore.fs.Components
-import org.oxycblt.auxio.music.stack.explore.fs.Path
-import org.oxycblt.auxio.music.stack.explore.fs.Volume
-import org.oxycblt.auxio.music.stack.explore.fs.VolumeManager
+import org.oxycblt.auxio.musikr.explore.extractor.correctWhitespace
+import org.oxycblt.auxio.musikr.explore.fs.Components
+import org.oxycblt.auxio.musikr.explore.fs.Path
+import org.oxycblt.auxio.musikr.explore.fs.Volume
+import org.oxycblt.auxio.musikr.explore.fs.VolumeManager
 import org.oxycblt.auxio.util.unlikelyToBeNull
 import timber.log.Timber as L
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/locations/LocationAdapter.kt b/app/src/main/java/org/oxycblt/auxio/music/locations/LocationAdapter.kt
index bbcefd0ca..25127f9b5 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/locations/LocationAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/locations/LocationAdapter.kt
@@ -24,7 +24,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import org.oxycblt.auxio.databinding.ItemMusicLocationBinding
 import org.oxycblt.auxio.list.recycler.DialogRecyclerView
-import org.oxycblt.auxio.music.stack.explore.fs.Path
+import org.oxycblt.auxio.musikr.explore.fs.Path
 import org.oxycblt.auxio.util.context
 import org.oxycblt.auxio.util.inflater
 import timber.log.Timber as L
diff --git a/app/src/main/java/org/oxycblt/auxio/music/locations/MusicSourcesDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/locations/MusicSourcesDialog.kt
index e379287d2..45285966e 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/locations/MusicSourcesDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/locations/MusicSourcesDialog.kt
@@ -36,7 +36,7 @@ import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.DialogMusicLocationsBinding
 import org.oxycblt.auxio.music.MusicSettings
-import org.oxycblt.auxio.music.stack.explore.fs.DocumentPathFactory
+import org.oxycblt.auxio.musikr.explore.fs.DocumentPathFactory
 import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment
 import org.oxycblt.auxio.util.showToast
 import timber.log.Timber as L
diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/AudioProperties.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/AudioProperties.kt
index e6a975d1c..bb51156f7 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/metadata/AudioProperties.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/AudioProperties.kt
@@ -24,7 +24,7 @@ import android.media.MediaFormat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import org.oxycblt.auxio.music.Song
-import org.oxycblt.auxio.music.stack.explore.fs.MimeType
+import org.oxycblt.auxio.musikr.explore.fs.MimeType
 import timber.log.Timber as L
 
 /**
@@ -119,6 +119,7 @@ constructor(@ApplicationContext private val context: Context) : AudioProperties.
         return AudioProperties(
             bitrate,
             sampleRate,
-            MimeType(fromExtension = song.mimeType.fromExtension, fromFormat = formatMimeType))
+            MimeType(fromExtension = song.mimeType.fromExtension, fromFormat = formatMimeType)
+        )
     }
 }
diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/Separators.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/Separators.kt
index 1b0401905..c0b65a3b5 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/metadata/Separators.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/Separators.kt
@@ -18,8 +18,8 @@
  
 package org.oxycblt.auxio.music.metadata
 
-import org.oxycblt.auxio.music.stack.explore.extractor.correctWhitespace
-import org.oxycblt.auxio.music.stack.explore.extractor.splitEscaped
+import org.oxycblt.auxio.musikr.explore.extractor.correctWhitespace
+import org.oxycblt.auxio.musikr.explore.extractor.splitEscaped
 
 /**
  * Defines the user-specified parsing of multi-value tags. This should be used to parse any tags
diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/IndexerNotifications.kt b/app/src/main/java/org/oxycblt/auxio/music/service/IndexerNotifications.kt
index cf1905119..63f9f2c08 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/service/IndexerNotifications.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/service/IndexerNotifications.kt
@@ -25,7 +25,7 @@ import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.ForegroundServiceNotification
 import org.oxycblt.auxio.IntegerTable
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.music.stack.IndexingProgress
+import org.oxycblt.auxio.musikr.IndexingProgress
 import org.oxycblt.auxio.util.newMainPendingIntent
 import timber.log.Timber as L
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/SystemContentObserver.kt b/app/src/main/java/org/oxycblt/auxio/music/service/SystemContentObserver.kt
index 074983291..c2e648b9e 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/service/SystemContentObserver.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/service/SystemContentObserver.kt
@@ -27,7 +27,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.auxio.music.MusicSettings
-import org.oxycblt.auxio.music.stack.explore.fs.contentResolverSafe
+import org.oxycblt.auxio.musikr.explore.fs.contentResolverSafe
 import timber.log.Timber as L
 
 /**
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/Indexer.kt b/app/src/main/java/org/oxycblt/auxio/musikr/Indexer.kt
similarity index 90%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/Indexer.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/Indexer.kt
index cbce14a01..7c2fde9bb 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/Indexer.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/Indexer.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack
+package org.oxycblt.auxio.musikr
 
 import android.net.Uri
 import javax.inject.Inject
@@ -27,10 +27,10 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.buffer
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
-import org.oxycblt.auxio.music.stack.explore.Explorer
-import org.oxycblt.auxio.music.stack.interpret.Interpretation
-import org.oxycblt.auxio.music.stack.interpret.Interpreter
-import org.oxycblt.auxio.music.stack.interpret.model.MutableLibrary
+import org.oxycblt.auxio.musikr.explore.Explorer
+import org.oxycblt.auxio.musikr.interpret.Interpretation
+import org.oxycblt.auxio.musikr.interpret.Interpreter
+import org.oxycblt.auxio.musikr.interpret.model.MutableLibrary
 
 interface Indexer {
     suspend fun run(
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/StackModule.kt b/app/src/main/java/org/oxycblt/auxio/musikr/StackModule.kt
similarity index 96%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/StackModule.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/StackModule.kt
index c2f06b674..54e66d334 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/StackModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/StackModule.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack
+package org.oxycblt.auxio.musikr
 
 import dagger.Binds
 import dagger.Module
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/ExploreModule.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/ExploreModule.kt
similarity index 95%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/ExploreModule.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/ExploreModule.kt
index 6c7e80138..587042e90 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/ExploreModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/ExploreModule.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore
+package org.oxycblt.auxio.musikr.explore
 
 import dagger.Binds
 import dagger.Module
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/Explorer.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/Explorer.kt
similarity index 91%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/Explorer.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/Explorer.kt
index 58f8376d1..e7c612ccf 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/Explorer.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/Explorer.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore
+package org.oxycblt.auxio.musikr.explore
 
 import android.net.Uri
 import javax.inject.Inject
@@ -29,17 +29,16 @@ import kotlinx.coroutines.flow.buffer
 import kotlinx.coroutines.flow.flattenMerge
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.withIndex
-import org.oxycblt.auxio.music.stack.IndexingProgress
-import org.oxycblt.auxio.music.stack.explore.cache.CacheResult
-import org.oxycblt.auxio.music.stack.explore.cache.TagCache
-import org.oxycblt.auxio.music.stack.explore.extractor.TagExtractor
-import org.oxycblt.auxio.music.stack.explore.fs.DeviceFiles
-import org.oxycblt.auxio.music.stack.explore.playlists.StoredPlaylists
+import org.oxycblt.auxio.musikr.IndexingProgress
+import org.oxycblt.auxio.musikr.explore.cache.CacheResult
+import org.oxycblt.auxio.musikr.explore.cache.TagCache
+import org.oxycblt.auxio.musikr.explore.extractor.TagExtractor
+import org.oxycblt.auxio.musikr.explore.fs.DeviceFiles
+import org.oxycblt.auxio.musikr.explore.playlists.StoredPlaylists
 import timber.log.Timber
 
 interface Explorer {
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/Files.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/Files.kt
similarity index 96%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/Files.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/Files.kt
index 7f4991ceb..77c8e7a6f 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/Files.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/Files.kt
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore
+package org.oxycblt.auxio.musikr.explore
 
 import android.net.Uri
 import org.oxycblt.auxio.music.Music
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.music.info.Date
-import org.oxycblt.auxio.music.stack.explore.fs.Path
+import org.oxycblt.auxio.musikr.explore.fs.Path
 
 data class DeviceFile(
     val uri: Uri,
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/cache/TagCache.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/cache/TagCache.kt
similarity index 91%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/cache/TagCache.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/cache/TagCache.kt
index ac6f33ac4..94a50ef5b 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/cache/TagCache.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/cache/TagCache.kt
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.cache
+package org.oxycblt.auxio.musikr.explore.cache
 
 import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
-import org.oxycblt.auxio.music.stack.explore.AudioFile
-import org.oxycblt.auxio.music.stack.explore.DeviceFile
+import org.oxycblt.auxio.musikr.explore.AudioFile
+import org.oxycblt.auxio.musikr.explore.DeviceFile
 
 sealed interface CacheResult {
     data class Hit(val audioFile: AudioFile) : CacheResult
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/cache/TagCacheModule.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/cache/TagCacheModule.kt
similarity index 96%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/cache/TagCacheModule.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/cache/TagCacheModule.kt
index ffb4eaf06..2f1fcc41a 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/cache/TagCacheModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/cache/TagCacheModule.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.cache
+package org.oxycblt.auxio.musikr.explore.cache
 
 import android.content.Context
 import androidx.room.Room
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/cache/TagDatabase.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/cache/TagDatabase.kt
similarity index 95%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/cache/TagDatabase.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/cache/TagDatabase.kt
index 9c6d117e8..65118d778 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/cache/TagDatabase.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/cache/TagDatabase.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.cache
+package org.oxycblt.auxio.musikr.explore.cache
 
 import androidx.room.Dao
 import androidx.room.Database
@@ -29,10 +29,10 @@ import androidx.room.RoomDatabase
 import androidx.room.TypeConverter
 import androidx.room.TypeConverters
 import org.oxycblt.auxio.music.info.Date
-import org.oxycblt.auxio.music.stack.explore.AudioFile
-import org.oxycblt.auxio.music.stack.explore.DeviceFile
-import org.oxycblt.auxio.music.stack.explore.extractor.correctWhitespace
-import org.oxycblt.auxio.music.stack.explore.extractor.splitEscaped
+import org.oxycblt.auxio.musikr.explore.AudioFile
+import org.oxycblt.auxio.musikr.explore.DeviceFile
+import org.oxycblt.auxio.musikr.explore.extractor.correctWhitespace
+import org.oxycblt.auxio.musikr.explore.extractor.splitEscaped
 
 @Database(entities = [Tags::class], version = 50, exportSchema = false)
 abstract class TagDatabase : RoomDatabase() {
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/ExtractorModule.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/ExtractorModule.kt
similarity index 94%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/ExtractorModule.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/ExtractorModule.kt
index 3559acd40..29ef4c849 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/ExtractorModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/ExtractorModule.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.extractor
+package org.oxycblt.auxio.musikr.explore.extractor
 
 import dagger.Binds
 import dagger.Module
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/TagExtractor.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/TagExtractor.kt
similarity index 98%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/TagExtractor.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/TagExtractor.kt
index 7093bf01f..983e028ab 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/TagExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/TagExtractor.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.extractor
+package org.oxycblt.auxio.musikr.explore.extractor
 
 import android.content.Context
 import android.media.MediaMetadataRetriever
@@ -43,8 +43,8 @@ import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.guava.asDeferred
-import org.oxycblt.auxio.music.stack.explore.AudioFile
-import org.oxycblt.auxio.music.stack.explore.DeviceFile
+import org.oxycblt.auxio.musikr.explore.AudioFile
+import org.oxycblt.auxio.musikr.explore.DeviceFile
 import timber.log.Timber as L
 
 interface TagExtractor {
@@ -194,7 +194,8 @@ private class ChunkedMetadataRetriever(private val mediaSourceFactory: MediaSour
                 job = MetadataJob(data, mediaSourceCaller)
 
                 mediaSourceHandler.sendEmptyMessageDelayed(
-                    MESSAGE_CHECK_FAILURE, /* delayMs= */ CHECK_INTERVAL_MS)
+                    MESSAGE_CHECK_FAILURE, /* delayMs= */ CHECK_INTERVAL_MS
+                )
 
                 return true
             }
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/TagFields.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/TagFields.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/TagFields.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/TagFields.kt
index 005bc780d..e87d3782f 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/TagFields.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/TagFields.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.extractor
+package org.oxycblt.auxio.musikr.explore.extractor
 
 import androidx.core.text.isDigitsOnly
 import org.oxycblt.auxio.music.info.Date
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/TagUtil.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/TagUtil.kt
similarity index 98%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/TagUtil.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/TagUtil.kt
index 104bf7f69..44eee85c4 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/TagUtil.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/TagUtil.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.extractor
+package org.oxycblt.auxio.musikr.explore.extractor
 
 import org.oxycblt.auxio.util.positiveOrNull
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/TextTags.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/TextTags.kt
similarity index 98%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/TextTags.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/TextTags.kt
index 7a8571251..38f0fc028 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/extractor/TextTags.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/extractor/TextTags.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.extractor
+package org.oxycblt.auxio.musikr.explore.extractor
 
 import androidx.media3.common.Metadata
 import androidx.media3.extractor.metadata.id3.InternalFrame
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/DeviceFiles.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/DeviceFiles.kt
similarity index 95%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/DeviceFiles.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/DeviceFiles.kt
index 3b9f3307d..32b028c31 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/DeviceFiles.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/DeviceFiles.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.fs
+package org.oxycblt.auxio.musikr.explore.fs
 
 import android.content.ContentResolver
 import android.content.Context
@@ -31,7 +31,7 @@ import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flatMapMerge
 import kotlinx.coroutines.flow.flattenMerge
 import kotlinx.coroutines.flow.flow
-import org.oxycblt.auxio.music.stack.explore.DeviceFile
+import org.oxycblt.auxio.musikr.explore.DeviceFile
 import timber.log.Timber
 
 interface DeviceFiles {
@@ -65,7 +65,8 @@ constructor(
     ): Flow<DeviceFile> = flow {
         contentResolver.useQuery(
             DocumentsContract.buildChildDocumentsUriUsingTree(rootUri, treeDocumentId),
-            PROJECTION) { cursor ->
+            PROJECTION
+        ) { cursor ->
                 val childUriIndex =
                     cursor.getColumnIndexOrThrow(DocumentsContract.Document.COLUMN_DOCUMENT_ID)
                 val displayNameIndex =
@@ -97,7 +98,8 @@ constructor(
                                 mimeType,
                                 newPath,
                                 size,
-                                lastModified))
+                                lastModified)
+                        )
                     }
                 }
                 emitAll(recursive.asFlow().flattenMerge())
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/DocumentPathFactory.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/DocumentPathFactory.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/DocumentPathFactory.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/DocumentPathFactory.kt
index 6c4e79b29..224ef78f3 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/DocumentPathFactory.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/DocumentPathFactory.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.fs
+package org.oxycblt.auxio.musikr.explore.fs
 
 import android.content.ContentUris
 import android.content.Context
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/Fs.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/Fs.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/Fs.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/Fs.kt
index 66ffb1256..dd8bffcaf 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/Fs.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/Fs.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.fs
+package org.oxycblt.auxio.musikr.explore.fs
 
 import android.content.Context
 import android.media.MediaFormat
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/FsModule.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/FsModule.kt
similarity index 97%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/FsModule.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/FsModule.kt
index 54906a1b3..9063dca20 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/FsModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/FsModule.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.fs
+package org.oxycblt.auxio.musikr.explore.fs
 
 import android.content.ContentResolver
 import android.content.Context
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/MediaStorePathInterpreter.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/MediaStorePathInterpreter.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/MediaStorePathInterpreter.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/MediaStorePathInterpreter.kt
index 58d6c7b8c..1e7ec27c4 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/MediaStorePathInterpreter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/MediaStorePathInterpreter.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.fs
+package org.oxycblt.auxio.musikr.explore.fs
 
 import android.database.Cursor
 import android.os.Build
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/StorageUtil.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/StorageUtil.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/StorageUtil.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/StorageUtil.kt
index 72767edb8..61082a198 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/fs/StorageUtil.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/fs/StorageUtil.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.fs
+package org.oxycblt.auxio.musikr.explore.fs
 
 import android.annotation.SuppressLint
 import android.content.ContentResolver
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/playlists/PlaylistDatabase.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/playlists/PlaylistDatabase.kt
similarity index 98%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/playlists/PlaylistDatabase.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/playlists/PlaylistDatabase.kt
index f32efc69a..46691d21f 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/playlists/PlaylistDatabase.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/playlists/PlaylistDatabase.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.playlists
+package org.oxycblt.auxio.musikr.explore.playlists
 
 import androidx.room.Dao
 import androidx.room.Database
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/playlists/RawPlaylist.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/playlists/RawPlaylist.kt
similarity index 97%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/playlists/RawPlaylist.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/playlists/RawPlaylist.kt
index ee79bb5fa..003244671 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/playlists/RawPlaylist.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/playlists/RawPlaylist.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.playlists
+package org.oxycblt.auxio.musikr.explore.playlists
 
 import androidx.room.ColumnInfo
 import androidx.room.Embedded
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/playlists/StoredPlaylists.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/playlists/StoredPlaylists.kt
similarity index 91%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/playlists/StoredPlaylists.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/playlists/StoredPlaylists.kt
index bf054baaf..8e1e2468b 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/playlists/StoredPlaylists.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/playlists/StoredPlaylists.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.playlists
+package org.oxycblt.auxio.musikr.explore.playlists
 
 import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
@@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
-import org.oxycblt.auxio.music.stack.explore.PlaylistFile
+import org.oxycblt.auxio.musikr.explore.PlaylistFile
 
 interface StoredPlaylists {
     fun read(): Flow<PlaylistFile>
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/playlists/UserModule.kt b/app/src/main/java/org/oxycblt/auxio/musikr/explore/playlists/UserModule.kt
similarity index 96%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/explore/playlists/UserModule.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/explore/playlists/UserModule.kt
index 0b8891922..824cb6d8c 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/explore/playlists/UserModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/explore/playlists/UserModule.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.explore.playlists
+package org.oxycblt.auxio.musikr.explore.playlists
 
 import android.content.Context
 import androidx.room.Room
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/InterpretModule.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/InterpretModule.kt
similarity index 95%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/InterpretModule.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/InterpretModule.kt
index 9a81b70e0..9c8453e58 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/InterpretModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/InterpretModule.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret
+package org.oxycblt.auxio.musikr.interpret
 
 import dagger.Binds
 import dagger.Module
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/Interpretation.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/Interpretation.kt
similarity index 95%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/Interpretation.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/Interpretation.kt
index b3da26d43..00ecacddd 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/Interpretation.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/Interpretation.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret
+package org.oxycblt.auxio.musikr.interpret
 
 import org.oxycblt.auxio.music.info.Name
 import org.oxycblt.auxio.music.metadata.Separators
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/Interpreter.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/Interpreter.kt
similarity index 79%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/Interpreter.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/Interpreter.kt
index b2b01301f..d9a7b0132 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/Interpreter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/Interpreter.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret
+package org.oxycblt.auxio.musikr.interpret
 
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
@@ -28,21 +28,21 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.toList
 import org.oxycblt.auxio.music.Music
-import org.oxycblt.auxio.music.stack.explore.AudioFile
-import org.oxycblt.auxio.music.stack.explore.PlaylistFile
-import org.oxycblt.auxio.music.stack.interpret.linker.AlbumLinker
-import org.oxycblt.auxio.music.stack.interpret.linker.ArtistLinker
-import org.oxycblt.auxio.music.stack.interpret.linker.GenreLinker
-import org.oxycblt.auxio.music.stack.interpret.linker.Linked
-import org.oxycblt.auxio.music.stack.interpret.linker.LinkedSong
-import org.oxycblt.auxio.music.stack.interpret.model.AlbumImpl
-import org.oxycblt.auxio.music.stack.interpret.model.ArtistImpl
-import org.oxycblt.auxio.music.stack.interpret.model.GenreImpl
-import org.oxycblt.auxio.music.stack.interpret.model.LibraryImpl
-import org.oxycblt.auxio.music.stack.interpret.model.MutableLibrary
-import org.oxycblt.auxio.music.stack.interpret.model.SongImpl
-import org.oxycblt.auxio.music.stack.interpret.prepare.PreSong
-import org.oxycblt.auxio.music.stack.interpret.prepare.Preparer
+import org.oxycblt.auxio.musikr.explore.AudioFile
+import org.oxycblt.auxio.musikr.explore.PlaylistFile
+import org.oxycblt.auxio.musikr.interpret.linker.AlbumLinker
+import org.oxycblt.auxio.musikr.interpret.linker.ArtistLinker
+import org.oxycblt.auxio.musikr.interpret.linker.GenreLinker
+import org.oxycblt.auxio.musikr.interpret.linker.Linked
+import org.oxycblt.auxio.musikr.interpret.linker.LinkedSong
+import org.oxycblt.auxio.musikr.interpret.model.AlbumImpl
+import org.oxycblt.auxio.musikr.interpret.model.ArtistImpl
+import org.oxycblt.auxio.musikr.interpret.model.GenreImpl
+import org.oxycblt.auxio.musikr.interpret.model.LibraryImpl
+import org.oxycblt.auxio.musikr.interpret.model.MutableLibrary
+import org.oxycblt.auxio.musikr.interpret.model.SongImpl
+import org.oxycblt.auxio.musikr.interpret.prepare.PreSong
+import org.oxycblt.auxio.musikr.interpret.prepare.Preparer
 import timber.log.Timber as L
 
 interface Interpreter {
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/AlbumLinker.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/AlbumLinker.kt
similarity index 94%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/AlbumLinker.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/AlbumLinker.kt
index 74b8ee49d..6cb4d8908 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/AlbumLinker.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/AlbumLinker.kt
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.linker
+package org.oxycblt.auxio.musikr.interpret.linker
 
 import java.util.UUID
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import org.oxycblt.auxio.music.stack.interpret.model.AlbumImpl
-import org.oxycblt.auxio.music.stack.interpret.model.SongImpl
+import org.oxycblt.auxio.musikr.interpret.model.AlbumImpl
+import org.oxycblt.auxio.musikr.interpret.model.SongImpl
 
 class AlbumLinker {
     private val tree = mutableMapOf<String?, MutableMap<UUID?, AlbumLink>>()
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/ArtistLinker.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/ArtistLinker.kt
similarity index 92%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/ArtistLinker.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/ArtistLinker.kt
index 33fa568bb..10016f00e 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/ArtistLinker.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/ArtistLinker.kt
@@ -16,17 +16,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.linker
+package org.oxycblt.auxio.musikr.interpret.linker
 
 import java.util.UUID
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.oxycblt.auxio.music.Music
-import org.oxycblt.auxio.music.stack.interpret.model.AlbumImpl
-import org.oxycblt.auxio.music.stack.interpret.model.ArtistImpl
-import org.oxycblt.auxio.music.stack.interpret.model.SongImpl
-import org.oxycblt.auxio.music.stack.interpret.prepare.PreAlbum
-import org.oxycblt.auxio.music.stack.interpret.prepare.PreArtist
+import org.oxycblt.auxio.musikr.interpret.model.AlbumImpl
+import org.oxycblt.auxio.musikr.interpret.model.ArtistImpl
+import org.oxycblt.auxio.musikr.interpret.model.SongImpl
+import org.oxycblt.auxio.musikr.interpret.prepare.PreAlbum
+import org.oxycblt.auxio.musikr.interpret.prepare.PreArtist
 
 class ArtistLinker {
     private val tree = mutableMapOf<String?, MutableMap<UUID?, ArtistLink>>()
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/Contribution.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/Contribution.kt
similarity index 95%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/Contribution.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/Contribution.kt
index b2bf11e42..2166f9053 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/Contribution.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/Contribution.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.linker
+package org.oxycblt.auxio.musikr.interpret.linker
 
 class Contribution<T> {
     private val map = mutableMapOf<T, Int>()
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/GenreLinker.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/GenreLinker.kt
similarity index 88%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/GenreLinker.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/GenreLinker.kt
index 2792cc578..ff9c87076 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/GenreLinker.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/GenreLinker.kt
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.linker
+package org.oxycblt.auxio.musikr.interpret.linker
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import org.oxycblt.auxio.music.stack.interpret.model.GenreImpl
-import org.oxycblt.auxio.music.stack.interpret.model.SongImpl
-import org.oxycblt.auxio.music.stack.interpret.prepare.PreGenre
-import org.oxycblt.auxio.music.stack.interpret.prepare.PreSong
+import org.oxycblt.auxio.musikr.interpret.model.GenreImpl
+import org.oxycblt.auxio.musikr.interpret.model.SongImpl
+import org.oxycblt.auxio.musikr.interpret.prepare.PreGenre
+import org.oxycblt.auxio.musikr.interpret.prepare.PreSong
 
 class GenreLinker {
     private val tree = mutableMapOf<String?, GenreLink>()
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/LinkedMusic.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/LinkedMusic.kt
similarity index 68%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/LinkedMusic.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/LinkedMusic.kt
index ef3ac713a..a1a383cc4 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/LinkedMusic.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/LinkedMusic.kt
@@ -16,16 +16,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.linker
+package org.oxycblt.auxio.musikr.interpret.linker
 
-import org.oxycblt.auxio.music.stack.interpret.model.AlbumImpl
-import org.oxycblt.auxio.music.stack.interpret.model.ArtistImpl
-import org.oxycblt.auxio.music.stack.interpret.model.GenreImpl
-import org.oxycblt.auxio.music.stack.interpret.model.PlaylistImpl
-import org.oxycblt.auxio.music.stack.interpret.model.SongImpl
-import org.oxycblt.auxio.music.stack.interpret.prepare.PreAlbum
-import org.oxycblt.auxio.music.stack.interpret.prepare.PrePlaylist
-import org.oxycblt.auxio.music.stack.interpret.prepare.PreSong
+import org.oxycblt.auxio.musikr.interpret.model.AlbumImpl
+import org.oxycblt.auxio.musikr.interpret.model.ArtistImpl
+import org.oxycblt.auxio.musikr.interpret.model.GenreImpl
+import org.oxycblt.auxio.musikr.interpret.model.PlaylistImpl
+import org.oxycblt.auxio.musikr.interpret.model.SongImpl
+import org.oxycblt.auxio.musikr.interpret.prepare.PreAlbum
+import org.oxycblt.auxio.musikr.interpret.prepare.PrePlaylist
+import org.oxycblt.auxio.musikr.interpret.prepare.PreSong
 
 interface LinkedSong {
     val preSong: PreSong
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/PlaylistLinker.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/PlaylistLinker.kt
similarity index 85%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/PlaylistLinker.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/PlaylistLinker.kt
index 68ac9689c..696575e6b 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/linker/PlaylistLinker.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/linker/PlaylistLinker.kt
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.linker
+package org.oxycblt.auxio.musikr.interpret.linker
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
-import org.oxycblt.auxio.music.stack.explore.PlaylistFile
-import org.oxycblt.auxio.music.stack.interpret.model.PlaylistImpl
+import org.oxycblt.auxio.musikr.explore.PlaylistFile
+import org.oxycblt.auxio.musikr.interpret.model.PlaylistImpl
 
 class PlaylistLinker {
     fun register(
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/DeviceMusicImpl.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/model/DeviceMusicImpl.kt
similarity index 96%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/DeviceMusicImpl.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/model/DeviceMusicImpl.kt
index e004fb035..b40107de5 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/DeviceMusicImpl.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/model/DeviceMusicImpl.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.model
+package org.oxycblt.auxio.musikr.interpret.model
 
 import kotlin.math.min
 import org.oxycblt.auxio.image.Cover
@@ -28,10 +28,10 @@ import org.oxycblt.auxio.music.Music
 import org.oxycblt.auxio.music.MusicType
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.music.info.Date
-import org.oxycblt.auxio.music.stack.interpret.linker.LinkedAlbum
-import org.oxycblt.auxio.music.stack.interpret.linker.LinkedSong
-import org.oxycblt.auxio.music.stack.interpret.prepare.PreArtist
-import org.oxycblt.auxio.music.stack.interpret.prepare.PreGenre
+import org.oxycblt.auxio.musikr.interpret.linker.LinkedAlbum
+import org.oxycblt.auxio.musikr.interpret.linker.LinkedSong
+import org.oxycblt.auxio.musikr.interpret.prepare.PreArtist
+import org.oxycblt.auxio.musikr.interpret.prepare.PreGenre
 import org.oxycblt.auxio.util.update
 
 /**
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/Library.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/model/Library.kt
similarity index 96%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/Library.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/model/Library.kt
index e094b0ee3..6cf7daa8f 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/Library.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/model/Library.kt
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.model
+package org.oxycblt.auxio.musikr.interpret.model
 
 import org.oxycblt.auxio.music.Library
 import org.oxycblt.auxio.music.Music
 import org.oxycblt.auxio.music.Playlist
 import org.oxycblt.auxio.music.Song
-import org.oxycblt.auxio.music.stack.explore.fs.Path
+import org.oxycblt.auxio.musikr.explore.fs.Path
 
 interface MutableLibrary : Library {
     suspend fun createPlaylist(name: String, songs: List<Song>): MutableLibrary
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/PlaylistImpl.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/model/PlaylistImpl.kt
similarity index 93%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/PlaylistImpl.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/model/PlaylistImpl.kt
index d48346eb3..097ee0002 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/PlaylistImpl.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/model/PlaylistImpl.kt
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.model
+package org.oxycblt.auxio.musikr.interpret.model
 
 import org.oxycblt.auxio.image.Cover
 import org.oxycblt.auxio.music.Playlist
 import org.oxycblt.auxio.music.info.Name
-import org.oxycblt.auxio.music.stack.interpret.linker.LinkedPlaylist
+import org.oxycblt.auxio.musikr.interpret.linker.LinkedPlaylist
 
 class PlaylistImpl(linkedPlaylist: LinkedPlaylist) : Playlist {
     private val prePlaylist = linkedPlaylist.prePlaylist
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/ID3Genre.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/prepare/ID3Genre.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/ID3Genre.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/prepare/ID3Genre.kt
index 1c36e9a11..d456f6838 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/ID3Genre.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/prepare/ID3Genre.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.prepare
+package org.oxycblt.auxio.musikr.interpret.prepare
 
 /// --- ID3v2 PARSING ---
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/PreMusic.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/prepare/PreMusic.kt
similarity index 92%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/PreMusic.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/prepare/PreMusic.kt
index 15c141ff5..b4a9229df 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/PreMusic.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/prepare/PreMusic.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.prepare
+package org.oxycblt.auxio.musikr.interpret.prepare
 
 import android.net.Uri
 import java.util.UUID
@@ -26,9 +26,9 @@ import org.oxycblt.auxio.music.info.Date
 import org.oxycblt.auxio.music.info.Disc
 import org.oxycblt.auxio.music.info.Name
 import org.oxycblt.auxio.music.info.ReleaseType
-import org.oxycblt.auxio.music.stack.explore.PlaylistHandle
-import org.oxycblt.auxio.music.stack.explore.fs.MimeType
-import org.oxycblt.auxio.music.stack.explore.fs.Path
+import org.oxycblt.auxio.musikr.explore.PlaylistHandle
+import org.oxycblt.auxio.musikr.explore.fs.MimeType
+import org.oxycblt.auxio.musikr.explore.fs.Path
 import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
 import org.oxycblt.auxio.util.update
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/PrepareModule.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/prepare/PrepareModule.kt
similarity index 94%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/PrepareModule.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/prepare/PrepareModule.kt
index fbc6d88ef..85447d9a2 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/PrepareModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/prepare/PrepareModule.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.prepare
+package org.oxycblt.auxio.musikr.interpret.prepare
 
 import dagger.Binds
 import dagger.Module
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/Preparer.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/prepare/Preparer.kt
similarity index 96%
rename from app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/Preparer.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/prepare/Preparer.kt
index d67948da4..df428229e 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/Preparer.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/prepare/Preparer.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.stack.interpret.prepare
+package org.oxycblt.auxio.musikr.interpret.prepare
 
 import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
@@ -25,9 +25,9 @@ import org.oxycblt.auxio.R
 import org.oxycblt.auxio.music.info.Disc
 import org.oxycblt.auxio.music.info.Name
 import org.oxycblt.auxio.music.info.ReleaseType
-import org.oxycblt.auxio.music.stack.explore.AudioFile
-import org.oxycblt.auxio.music.stack.explore.fs.MimeType
-import org.oxycblt.auxio.music.stack.interpret.Interpretation
+import org.oxycblt.auxio.musikr.explore.AudioFile
+import org.oxycblt.auxio.musikr.explore.fs.MimeType
+import org.oxycblt.auxio.musikr.interpret.Interpretation
 import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
 import org.oxycblt.auxio.util.toUuidOrNull
 
diff --git a/app/src/test/java/org/oxycblt/auxio/music/metadata/TagUtilTest.kt b/app/src/test/java/org/oxycblt/auxio/music/metadata/TagUtilTest.kt
index b000313c0..f795542a1 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/metadata/TagUtilTest.kt
+++ b/app/src/test/java/org/oxycblt/auxio/music/metadata/TagUtilTest.kt
@@ -20,11 +20,11 @@ package org.oxycblt.auxio.music.metadata
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.oxycblt.auxio.music.stack.explore.extractor.correctWhitespace
-import org.oxycblt.auxio.music.stack.explore.extractor.parseId3v2PositionField
-import org.oxycblt.auxio.music.stack.explore.extractor.parseVorbisPositionField
-import org.oxycblt.auxio.music.stack.explore.extractor.splitEscaped
-import org.oxycblt.auxio.music.stack.interpret.prepare.parseId3GenreNames
+import org.oxycblt.auxio.musikr.explore.extractor.correctWhitespace
+import org.oxycblt.auxio.musikr.explore.extractor.parseId3v2PositionField
+import org.oxycblt.auxio.musikr.explore.extractor.parseVorbisPositionField
+import org.oxycblt.auxio.musikr.explore.extractor.splitEscaped
+import org.oxycblt.auxio.musikr.interpret.prepare.parseId3GenreNames
 
 class TagUtilTest {
     @Test
diff --git a/app/src/test/java/org/oxycblt/auxio/music/metadata/TextTagsTest.kt b/app/src/test/java/org/oxycblt/auxio/music/metadata/TextTagsTest.kt
index c431e4cbb..4b744c0e2 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/metadata/TextTagsTest.kt
+++ b/app/src/test/java/org/oxycblt/auxio/music/metadata/TextTagsTest.kt
@@ -27,7 +27,7 @@ import androidx.media3.extractor.metadata.vorbis.VorbisComment
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.oxycblt.auxio.music.stack.explore.extractor.TextTags
+import org.oxycblt.auxio.musikr.explore.extractor.TextTags
 
 class TextTagsTest {
     @Test