diff --git a/app/src/main/java/org/oxycblt/musikr/fs/path/VolumeCompat.kt b/app/src/main/java/org/oxycblt/musikr/fs/path/VolumeCompat.kt
index 2c07405b3..ceaf5771f 100644
--- a/app/src/main/java/org/oxycblt/musikr/fs/path/VolumeCompat.kt
+++ b/app/src/main/java/org/oxycblt/musikr/fs/path/VolumeCompat.kt
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2024 Auxio Project
+ * VolumeCompat.kt is part of Auxio.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
 package org.oxycblt.musikr.fs.path
 
 import android.annotation.SuppressLint
@@ -8,8 +26,8 @@ import android.os.Environment
 import android.os.storage.StorageManager
 import android.os.storage.StorageVolume
 import android.provider.MediaStore
-import org.oxycblt.auxio.util.lazyReflectedMethod
 import java.lang.reflect.Method
+import org.oxycblt.auxio.util.lazyReflectedMethod
 
 // Largely derived from Material Files: https://github.com/zhanghai/MaterialFiles
 
diff --git a/app/src/main/java/org/oxycblt/musikr/fs/path/VolumeManager.kt b/app/src/main/java/org/oxycblt/musikr/fs/path/VolumeManager.kt
index aa5709ce1..8fed33e94 100644
--- a/app/src/main/java/org/oxycblt/musikr/fs/path/VolumeManager.kt
+++ b/app/src/main/java/org/oxycblt/musikr/fs/path/VolumeManager.kt
@@ -24,12 +24,6 @@ import android.os.storage.StorageVolume
 import javax.inject.Inject
 import org.oxycblt.musikr.fs.Components
 import org.oxycblt.musikr.fs.Volume
-import org.oxycblt.musikr.fs.directoryCompat
-import org.oxycblt.musikr.fs.getDescriptionCompat
-import org.oxycblt.musikr.fs.isInternalCompat
-import org.oxycblt.musikr.fs.mediaStoreVolumeNameCompat
-import org.oxycblt.musikr.fs.storageVolumesCompat
-import org.oxycblt.musikr.fs.uuidCompat
 
 /** A wrapper around [StorageManager] that provides instances of the [Volume] interface. */
 interface VolumeManager {
diff --git a/app/src/main/java/org/oxycblt/musikr/playlist/ExternalPlaylistManager.kt b/app/src/main/java/org/oxycblt/musikr/playlist/ExternalPlaylistManager.kt
index a6a33bd75..8b1dd2eca 100644
--- a/app/src/main/java/org/oxycblt/musikr/playlist/ExternalPlaylistManager.kt
+++ b/app/src/main/java/org/oxycblt/musikr/playlist/ExternalPlaylistManager.kt
@@ -25,8 +25,8 @@ import javax.inject.Inject
 import org.oxycblt.musikr.Playlist
 import org.oxycblt.musikr.fs.Components
 import org.oxycblt.musikr.fs.Path
-import org.oxycblt.musikr.fs.util.contentResolverSafe
 import org.oxycblt.musikr.fs.path.DocumentPathFactory
+import org.oxycblt.musikr.fs.util.contentResolverSafe
 import org.oxycblt.musikr.playlist.m3u.M3U
 import timber.log.Timber as L
 
diff --git a/app/src/test/java/org/oxycblt/auxio/music/info/DateTest.kt b/app/src/test/java/org/oxycblt/musikr/tag/DateTest.kt
similarity index 97%
rename from app/src/test/java/org/oxycblt/auxio/music/info/DateTest.kt
rename to app/src/test/java/org/oxycblt/musikr/tag/DateTest.kt
index 8806d7e0a..b2cb3380d 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/info/DateTest.kt
+++ b/app/src/test/java/org/oxycblt/musikr/tag/DateTest.kt
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.info
+package org.oxycblt.musikr.tag
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.oxycblt.musikr.tag.Date
 
 class DateTest {
     @Test
diff --git a/app/src/test/java/org/oxycblt/auxio/music/info/DiscTest.kt b/app/src/test/java/org/oxycblt/musikr/tag/DiscTest.kt
similarity index 95%
rename from app/src/test/java/org/oxycblt/auxio/music/info/DiscTest.kt
rename to app/src/test/java/org/oxycblt/musikr/tag/DiscTest.kt
index f1461757e..ab79073f9 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/info/DiscTest.kt
+++ b/app/src/test/java/org/oxycblt/musikr/tag/DiscTest.kt
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.info
+package org.oxycblt.musikr.tag
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.oxycblt.musikr.tag.Disc
 
 class DiscTest {
     @Test
diff --git a/app/src/test/java/org/oxycblt/auxio/music/info/NameTest.kt b/app/src/test/java/org/oxycblt/musikr/tag/NameTest.kt
similarity index 99%
rename from app/src/test/java/org/oxycblt/auxio/music/info/NameTest.kt
rename to app/src/test/java/org/oxycblt/musikr/tag/NameTest.kt
index a28b30504..d3c2e7bec 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/info/NameTest.kt
+++ b/app/src/test/java/org/oxycblt/musikr/tag/NameTest.kt
@@ -16,13 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.info
+package org.oxycblt.musikr.tag
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Test
-import org.oxycblt.musikr.tag.Name
-import org.oxycblt.musikr.tag.SortToken
 
 class NameTest {
     @Test
diff --git a/app/src/test/java/org/oxycblt/auxio/music/info/ReleaseTypeTest.kt b/app/src/test/java/org/oxycblt/musikr/tag/ReleaseTypeTest.kt
similarity index 97%
rename from app/src/test/java/org/oxycblt/auxio/music/info/ReleaseTypeTest.kt
rename to app/src/test/java/org/oxycblt/musikr/tag/ReleaseTypeTest.kt
index 9d3488d9b..cd0627547 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/info/ReleaseTypeTest.kt
+++ b/app/src/test/java/org/oxycblt/musikr/tag/ReleaseTypeTest.kt
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.info
+package org.oxycblt.musikr.tag
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.oxycblt.musikr.tag.ReleaseType
 
 class ReleaseTypeTest {
     @Test
diff --git a/app/src/test/java/org/oxycblt/auxio/music/metadata/SeparatorsTest.kt b/app/src/test/java/org/oxycblt/musikr/tag/interpret/SeparatorsTest.kt
similarity index 94%
rename from app/src/test/java/org/oxycblt/auxio/music/metadata/SeparatorsTest.kt
rename to app/src/test/java/org/oxycblt/musikr/tag/interpret/SeparatorsTest.kt
index d8ecebbc7..3f6ac6dd5 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/metadata/SeparatorsTest.kt
+++ b/app/src/test/java/org/oxycblt/musikr/tag/interpret/SeparatorsTest.kt
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.metadata
+package org.oxycblt.musikr.tag.interpret
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.oxycblt.musikr.tag.interpret.Separators
 
 class SeparatorsTest {
     @Test
diff --git a/app/src/test/java/org/oxycblt/auxio/music/metadata/TagUtilTest.kt b/app/src/test/java/org/oxycblt/musikr/tag/parse/TagUtilTest.kt
similarity index 99%
rename from app/src/test/java/org/oxycblt/auxio/music/metadata/TagUtilTest.kt
rename to app/src/test/java/org/oxycblt/musikr/tag/parse/TagUtilTest.kt
index 1c50ffbe1..d2e3e92f5 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/metadata/TagUtilTest.kt
+++ b/app/src/test/java/org/oxycblt/musikr/tag/parse/TagUtilTest.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.musikr.tag.parse
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
diff --git a/app/src/test/java/org/oxycblt/auxio/music/metadata/TextCachedTagsTest.kt b/app/src/test/java/org/oxycblt/musikr/tag/parse/TextTagsTest.kt
similarity index 97%
rename from app/src/test/java/org/oxycblt/auxio/music/metadata/TextCachedTagsTest.kt
rename to app/src/test/java/org/oxycblt/musikr/tag/parse/TextTagsTest.kt
index a7e87334b..2f6a75a30 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/metadata/TextCachedTagsTest.kt
+++ b/app/src/test/java/org/oxycblt/musikr/tag/parse/TextTagsTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2023 Auxio Project
- * TextCachedTagsTest.kt is part of Auxio.
+ * TextTagsTest.kt is part of Auxio.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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.musikr.tag.parse
 
 import androidx.media3.common.Metadata
 import androidx.media3.extractor.metadata.flac.PictureFrame
@@ -27,9 +27,8 @@ import androidx.media3.extractor.metadata.vorbis.VorbisComment
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.oxycblt.musikr.tag.parse.ExoPlayerTags
 
-class TextCachedTagsTest {
+class TextTagsTest {
     @Test
     fun textTags_vorbis() {
         val exoPlayerTags = ExoPlayerTags(VORBIS_METADATA)