diff --git a/app/src/main/java/org/oxycblt/auxio/database/DatabaseUtils.kt b/app/src/main/java/org/oxycblt/auxio/database/DatabaseUtils.kt
deleted file mode 100644
index 5f970e990..000000000
--- a/app/src/main/java/org/oxycblt/auxio/database/DatabaseUtils.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2021 Auxio Project
- * DatabaseUtils.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.auxio.database
-
-import android.database.Cursor
-import android.database.sqlite.SQLiteDatabase
-
-/**
- * Shortcut for querying all items in a database and running [block] with the cursor returned.
- * Will not run if the cursor is null.
- */
-fun <R> SQLiteDatabase.queryAll(tableName: String, block: (Cursor) -> R) =
-    query(tableName, null, null, null, null, null, null)?.use(block)
diff --git a/app/src/main/java/org/oxycblt/auxio/database/BlacklistDatabase.kt b/app/src/main/java/org/oxycblt/auxio/music/BlacklistDatabase.kt
similarity index 98%
rename from app/src/main/java/org/oxycblt/auxio/database/BlacklistDatabase.kt
rename to app/src/main/java/org/oxycblt/auxio/music/BlacklistDatabase.kt
index f1d275be0..df80b10c0 100644
--- a/app/src/main/java/org/oxycblt/auxio/database/BlacklistDatabase.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/BlacklistDatabase.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.oxycblt.auxio.database
+package org.oxycblt.auxio.music
 
 import android.content.ContentValues
 import android.content.Context
@@ -25,6 +25,7 @@ import android.database.sqlite.SQLiteOpenHelper
 import androidx.core.database.sqlite.transaction
 import org.oxycblt.auxio.logD
 import org.oxycblt.auxio.ui.assertBackgroundThread
+import org.oxycblt.auxio.ui.queryAll
 
 /**
  * Database for storing blacklisted paths.
diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt
index b5796e0f6..71018a132 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt
@@ -27,7 +27,6 @@ import android.provider.MediaStore.Audio.Genres
 import android.provider.MediaStore.Audio.Media
 import androidx.core.database.getStringOrNull
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.database.BlacklistDatabase
 import org.oxycblt.auxio.logD
 
 /**
diff --git a/app/src/main/java/org/oxycblt/auxio/database/PlaybackState.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackState.kt
similarity index 98%
rename from app/src/main/java/org/oxycblt/auxio/database/PlaybackState.kt
rename to app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackState.kt
index eda13498e..14b60ecc0 100644
--- a/app/src/main/java/org/oxycblt/auxio/database/PlaybackState.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackState.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.oxycblt.auxio.database
+package org.oxycblt.auxio.playback.state
 
 /**
  * A database entity that stores a compressed variant of the current playback state.
diff --git a/app/src/main/java/org/oxycblt/auxio/database/PlaybackStateDatabase.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/database/PlaybackStateDatabase.kt
rename to app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt
index 3f067e516..42685da38 100644
--- a/app/src/main/java/org/oxycblt/auxio/database/PlaybackStateDatabase.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt
@@ -16,13 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.oxycblt.auxio.database
+package org.oxycblt.auxio.playback.state
 
 import android.content.ContentValues
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
 import androidx.core.database.sqlite.transaction
+import org.oxycblt.auxio.ui.queryAll
 import org.oxycblt.auxio.logD
 import org.oxycblt.auxio.ui.assertBackgroundThread
 
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
index 2184c65b3..25cb08a58 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
@@ -21,9 +21,6 @@ package org.oxycblt.auxio.playback.state
 import android.content.Context
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.oxycblt.auxio.database.PlaybackState
-import org.oxycblt.auxio.database.PlaybackStateDatabase
-import org.oxycblt.auxio.database.QueueItem
 import org.oxycblt.auxio.logD
 import org.oxycblt.auxio.logE
 import org.oxycblt.auxio.music.Album
diff --git a/app/src/main/java/org/oxycblt/auxio/database/QueueItem.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/QueueItem.kt
similarity index 97%
rename from app/src/main/java/org/oxycblt/auxio/database/QueueItem.kt
rename to app/src/main/java/org/oxycblt/auxio/playback/state/QueueItem.kt
index f1bb6669d..ce11d9367 100644
--- a/app/src/main/java/org/oxycblt/auxio/database/QueueItem.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/QueueItem.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.oxycblt.auxio.database
+package org.oxycblt.auxio.playback.state
 
 /**
  * A database entity that stores a simplified representation of a song in a queue.
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistViewModel.kt b/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistViewModel.kt
index fb3832d9f..5a11aea71 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistViewModel.kt
@@ -27,7 +27,7 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.oxycblt.auxio.database.BlacklistDatabase
+import org.oxycblt.auxio.music.BlacklistDatabase
 
 /**
  * ViewModel that acts as a wrapper around [BlacklistDatabase], allowing for the addition/removal
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt b/app/src/main/java/org/oxycblt/auxio/ui/AndroidUtils.kt
similarity index 95%
rename from app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt
rename to app/src/main/java/org/oxycblt/auxio/ui/AndroidUtils.kt
index f4723faa4..08791de8e 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/AndroidUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2021 Auxio Project
- * InterfaceUtils.kt is part of Auxio.
+ * AndroidUtils.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
@@ -25,6 +25,8 @@ import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.content.res.Resources
+import android.database.Cursor
+import android.database.sqlite.SQLiteDatabase
 import android.graphics.drawable.AnimatedVectorDrawable
 import android.graphics.drawable.Drawable
 import android.os.Build
@@ -198,6 +200,14 @@ fun Context.newMainIntent(): PendingIntent {
     )
 }
 
+/**
+ * Shortcut for querying all items in a database and running [block] with the cursor returned.
+ * Will not run if the cursor is null.
+ */
+fun <R> SQLiteDatabase.queryAll(tableName: String, block: (Cursor) -> R) =
+    query(tableName, null, null, null, null, null, null)?.use(block)
+
+
 /**
  * Assert that we are on a background thread.
  */