diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
index 53b79f18f..b4b4bdd73 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
@@ -49,7 +49,7 @@ import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.auxio.music.MusicType
 import org.oxycblt.auxio.music.Playlist
 import org.oxycblt.auxio.music.Song
-import org.oxycblt.auxio.music.metadata.AudioProperties
+import org.oxycblt.auxio.musikr.metadata.AudioProperties
 import org.oxycblt.auxio.playback.PlaySong
 import org.oxycblt.auxio.playback.PlaybackSettings
 import org.oxycblt.auxio.util.Event
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt b/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt
index 5b881c708..4b1b2e52a 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt
@@ -35,7 +35,7 @@ import org.oxycblt.auxio.list.adapter.UpdateInstructions
 import org.oxycblt.auxio.music.Music
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.musikr.model.Name
-import org.oxycblt.auxio.music.metadata.AudioProperties
+import org.oxycblt.auxio.musikr.metadata.AudioProperties
 import org.oxycblt.auxio.music.resolveNames
 import org.oxycblt.auxio.playback.formatDurationMs
 import org.oxycblt.auxio.playback.replaygain.formatDb
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 48909a11f..c2eda40d2 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
@@ -26,7 +26,7 @@ import kotlinx.coroutines.withContext
 import kotlinx.coroutines.yield
 import org.oxycblt.auxio.music.MusicRepository.IndexingWorker
 import org.oxycblt.auxio.musikr.model.Name
-import org.oxycblt.auxio.music.metadata.Separators
+import org.oxycblt.auxio.musikr.interpret.Separators
 import org.oxycblt.auxio.musikr.Indexer
 import org.oxycblt.auxio.musikr.IndexingProgress
 import org.oxycblt.auxio.musikr.interpret.Interpretation
diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/SeparatorsDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/SeparatorsDialog.kt
index 49cbca524..1ac566a68 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/metadata/SeparatorsDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/SeparatorsDialog.kt
@@ -29,6 +29,7 @@ import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.DialogSeparatorsBinding
 import org.oxycblt.auxio.music.MusicSettings
+import org.oxycblt.auxio.musikr.interpret.Separators
 import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment
 import timber.log.Timber as L
 
diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/interpret/Interpretation.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/Interpretation.kt
index afe066ccc..2ac0d487e 100644
--- a/app/src/main/java/org/oxycblt/auxio/musikr/interpret/Interpretation.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/Interpretation.kt
@@ -19,6 +19,5 @@
 package org.oxycblt.auxio.musikr.interpret
 
 import org.oxycblt.auxio.musikr.model.Name
-import org.oxycblt.auxio.music.metadata.Separators
 
 data class Interpretation(val nameFactory: Name.Known.Factory, val separators: Separators)
diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/Separators.kt b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/Separators.kt
similarity index 98%
rename from app/src/main/java/org/oxycblt/auxio/music/metadata/Separators.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/interpret/Separators.kt
index 552d25d00..5c16dbd29 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/metadata/Separators.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/interpret/Separators.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.metadata
+package org.oxycblt.auxio.musikr.interpret
 
 import org.oxycblt.auxio.musikr.tag.extractor.correctWhitespace
 import org.oxycblt.auxio.musikr.tag.extractor.splitEscaped
diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/AudioProperties.kt b/app/src/main/java/org/oxycblt/auxio/musikr/metadata/AudioProperties.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/metadata/AudioProperties.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/metadata/AudioProperties.kt
index ed523a46a..c3a97e7ea 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/metadata/AudioProperties.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/metadata/AudioProperties.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.metadata
+package org.oxycblt.auxio.musikr.metadata
 
 import android.content.Context
 import android.media.MediaExtractor
diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/MetadataModule.kt b/app/src/main/java/org/oxycblt/auxio/musikr/metadata/MetadataModule.kt
similarity index 96%
rename from app/src/main/java/org/oxycblt/auxio/music/metadata/MetadataModule.kt
rename to app/src/main/java/org/oxycblt/auxio/musikr/metadata/MetadataModule.kt
index 4df060013..19d4b2007 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/metadata/MetadataModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/musikr/metadata/MetadataModule.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.metadata
+package org.oxycblt.auxio.musikr.metadata
 
 import dagger.Binds
 import dagger.Module
diff --git a/app/src/test/java/org/oxycblt/auxio/music/metadata/SeparatorsTest.kt b/app/src/test/java/org/oxycblt/auxio/music/metadata/SeparatorsTest.kt
index 440f044e3..fc06da1c7 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/metadata/SeparatorsTest.kt
+++ b/app/src/test/java/org/oxycblt/auxio/music/metadata/SeparatorsTest.kt
@@ -20,6 +20,7 @@ package org.oxycblt.auxio.music.metadata
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import org.oxycblt.auxio.musikr.interpret.Separators
 
 class SeparatorsTest {
     @Test