diff --git a/app/src/main/java/org/oxycblt/auxio/detail/Detail.kt b/app/src/main/java/org/oxycblt/auxio/detail/Detail.kt
index d5b32e584..c1a586010 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/Detail.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/Detail.kt
@@ -20,7 +20,7 @@ package org.oxycblt.auxio.detail
 import androidx.annotation.StringRes
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.music.Song
-import org.oxycblt.auxio.music.filesystem.MimeType
+import org.oxycblt.auxio.music.storage.MimeType
 
 /**
  * A header variation that displays a button to open a sort menu.
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 71ec1a6a8..0ef6b3054 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
@@ -39,7 +39,7 @@ import org.oxycblt.auxio.music.Music
 import org.oxycblt.auxio.music.MusicStore
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.music.Sort
-import org.oxycblt.auxio.music.filesystem.MimeType
+import org.oxycblt.auxio.music.storage.MimeType
 import org.oxycblt.auxio.settings.Settings
 import org.oxycblt.auxio.util.*
 
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 095bae072..cc0f9bf03 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
@@ -30,7 +30,7 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.list.Item
-import org.oxycblt.auxio.music.filesystem.*
+import org.oxycblt.auxio.music.storage.*
 import org.oxycblt.auxio.music.parsing.parseId3GenreNames
 import org.oxycblt.auxio.music.parsing.parseMultiValue
 import org.oxycblt.auxio.settings.Settings
diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt
index aa40f8ec5..f59356a3d 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt
@@ -20,8 +20,8 @@ package org.oxycblt.auxio.music
 import android.content.Context
 import android.net.Uri
 import android.provider.OpenableColumns
-import org.oxycblt.auxio.music.filesystem.contentResolverSafe
-import org.oxycblt.auxio.music.filesystem.useQuery
+import org.oxycblt.auxio.music.storage.contentResolverSafe
+import org.oxycblt.auxio.music.storage.useQuery
 
 /**
  * A repository granting access to the music library..
diff --git a/app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt b/app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt
index cc65b8b7f..88bce111f 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt
@@ -29,13 +29,13 @@ import androidx.core.database.getStringOrNull
 import java.io.File
 import org.oxycblt.auxio.music.Date
 import org.oxycblt.auxio.music.Song
-import org.oxycblt.auxio.music.filesystem.Directory
-import org.oxycblt.auxio.music.filesystem.contentResolverSafe
-import org.oxycblt.auxio.music.filesystem.directoryCompat
-import org.oxycblt.auxio.music.filesystem.mediaStoreVolumeNameCompat
-import org.oxycblt.auxio.music.filesystem.safeQuery
-import org.oxycblt.auxio.music.filesystem.storageVolumesCompat
-import org.oxycblt.auxio.music.filesystem.useQuery
+import org.oxycblt.auxio.music.storage.Directory
+import org.oxycblt.auxio.music.storage.contentResolverSafe
+import org.oxycblt.auxio.music.storage.directoryCompat
+import org.oxycblt.auxio.music.storage.mediaStoreVolumeNameCompat
+import org.oxycblt.auxio.music.storage.safeQuery
+import org.oxycblt.auxio.music.storage.storageVolumesCompat
+import org.oxycblt.auxio.music.storage.useQuery
 import org.oxycblt.auxio.music.parsing.parseId3v2Position
 import org.oxycblt.auxio.settings.Settings
 import org.oxycblt.auxio.util.getSystemServiceCompat
diff --git a/app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt b/app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt
index 8aad9fab7..74efcb29a 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt
@@ -23,7 +23,7 @@ import com.google.android.exoplayer2.MediaItem
 import com.google.android.exoplayer2.MetadataRetriever
 import org.oxycblt.auxio.music.Date
 import org.oxycblt.auxio.music.Song
-import org.oxycblt.auxio.music.filesystem.toAudioUri
+import org.oxycblt.auxio.music.storage.toAudioUri
 import org.oxycblt.auxio.music.parsing.parseId3v2Position
 import org.oxycblt.auxio.util.logD
 import org.oxycblt.auxio.util.logW
diff --git a/app/src/main/java/org/oxycblt/auxio/music/filesystem/DirectoryAdapter.kt b/app/src/main/java/org/oxycblt/auxio/music/storage/DirectoryAdapter.kt
similarity index 98%
rename from app/src/main/java/org/oxycblt/auxio/music/filesystem/DirectoryAdapter.kt
rename to app/src/main/java/org/oxycblt/auxio/music/storage/DirectoryAdapter.kt
index 5531d08ca..dcdedc0ef 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/filesystem/DirectoryAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/storage/DirectoryAdapter.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.filesystem
+package org.oxycblt.auxio.music.storage
 
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/oxycblt/auxio/music/filesystem/Filesystem.kt b/app/src/main/java/org/oxycblt/auxio/music/storage/Filesystem.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/filesystem/Filesystem.kt
rename to app/src/main/java/org/oxycblt/auxio/music/storage/Filesystem.kt
index b48e19c11..00a22deaf 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/filesystem/Filesystem.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/storage/Filesystem.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.filesystem
+package org.oxycblt.auxio.music.storage
 
 import android.content.Context
 import android.media.MediaFormat
diff --git a/app/src/main/java/org/oxycblt/auxio/music/filesystem/MusicDirsDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/storage/MusicDirsDialog.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/filesystem/MusicDirsDialog.kt
rename to app/src/main/java/org/oxycblt/auxio/music/storage/MusicDirsDialog.kt
index 4b297b7b0..b16db8f79 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/filesystem/MusicDirsDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/storage/MusicDirsDialog.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.filesystem
+package org.oxycblt.auxio.music.storage
 
 import android.content.ActivityNotFoundException
 import android.net.Uri
diff --git a/app/src/main/java/org/oxycblt/auxio/music/filesystem/FilesystemUtil.kt b/app/src/main/java/org/oxycblt/auxio/music/storage/StorageUtil.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/music/filesystem/FilesystemUtil.kt
rename to app/src/main/java/org/oxycblt/auxio/music/storage/StorageUtil.kt
index 8302aaf24..60bc797e9 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/filesystem/FilesystemUtil.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/storage/StorageUtil.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.filesystem
+package org.oxycblt.auxio.music.storage
 
 import android.annotation.SuppressLint
 import android.content.ContentResolver
diff --git a/app/src/main/java/org/oxycblt/auxio/music/system/IndexerService.kt b/app/src/main/java/org/oxycblt/auxio/music/system/IndexerService.kt
index 2f89bbe3b..9696b44e0 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/system/IndexerService.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/system/IndexerService.kt
@@ -34,7 +34,7 @@ import kotlinx.coroutines.launch
 import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.music.MusicStore
-import org.oxycblt.auxio.music.filesystem.contentResolverSafe
+import org.oxycblt.auxio.music.storage.contentResolverSafe
 import org.oxycblt.auxio.playback.state.PlaybackStateManager
 import org.oxycblt.auxio.service.ForegroundManager
 import org.oxycblt.auxio.settings.Settings
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/Settings.kt b/app/src/main/java/org/oxycblt/auxio/settings/Settings.kt
index 2412b5ee9..aabb07823 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/Settings.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/Settings.kt
@@ -31,8 +31,8 @@ import org.oxycblt.auxio.home.tabs.Tab
 import org.oxycblt.auxio.image.CoverMode
 import org.oxycblt.auxio.music.MusicMode
 import org.oxycblt.auxio.music.Sort
-import org.oxycblt.auxio.music.filesystem.Directory
-import org.oxycblt.auxio.music.filesystem.MusicDirectories
+import org.oxycblt.auxio.music.storage.Directory
+import org.oxycblt.auxio.music.storage.MusicDirectories
 import org.oxycblt.auxio.playback.ActionMode
 import org.oxycblt.auxio.playback.replaygain.ReplayGainMode
 import org.oxycblt.auxio.playback.replaygain.ReplayGainPreAmp
diff --git a/app/src/main/res/navigation/nav_main.xml b/app/src/main/res/navigation/nav_main.xml
index ab64b289e..d5c6c0b8d 100644
--- a/app/src/main/res/navigation/nav_main.xml
+++ b/app/src/main/res/navigation/nav_main.xml
@@ -106,7 +106,7 @@
         tools:layout="@layout/dialog_pre_amp" />
     <dialog
         android:id="@+id/music_dirs_dialog"
-        android:name="org.oxycblt.auxio.music.filesystem.MusicDirsDialog"
+        android:name="org.oxycblt.auxio.music.storage.MusicDirsDialog"
         android:label="music_dirs_dialog"
         tools:layout="@layout/dialog_music_dirs" />
     <dialog