diff --git a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt b/app/src/main/java/code/name/monkey/retromusic/MainModule.kt
index e1f77f0e..25aa04a5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/MainModule.kt
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic
 
 import code.name.monkey.retromusic.db.PlaylistDatabase
 import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.RealRoomPlaylistRepository
-import code.name.monkey.retromusic.db.RoomPlaylistRepository
+import code.name.monkey.retromusic.repository.RealRoomPlaylistRepository
+import code.name.monkey.retromusic.repository.RoomPlaylistRepository
 import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.albums.AlbumDetailsViewModel
 import code.name.monkey.retromusic.fragments.artists.ArtistDetailsViewModel
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistDao.kt b/app/src/main/java/code/name/monkey/retromusic/db/PlaylistDao.kt
index 461e37aa..53f3ee65 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistDao.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/db/PlaylistDao.kt
@@ -24,6 +24,9 @@ interface PlaylistDao {
     @Query("SELECT * FROM SongEntity WHERE playlist_creator_id = :playlistName AND id = :songId")
     suspend fun checkSongExistsWithPlaylistName(playlistName: String, songId: Int): List<SongEntity>
 
-    @Query("SELECT * FROM SongEntity WHERE playlist_creator_id = :playlistId ORDER BY song_key")
+    @Query("SELECT * FROM SongEntity WHERE playlist_creator_id = :playlistId ORDER BY title")
     suspend fun getSongs(playlistId: Int): List<SongEntity>
+
+    @Delete
+    suspend fun deletePlaylistEntity(playlistWithSongs: PlaylistWithSongs)
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToRetroPlaylist.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToRetroPlaylist.kt
index 61006a57..28d351bc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToRetroPlaylist.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToRetroPlaylist.kt
@@ -7,7 +7,7 @@ import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.RoomPlaylistRepository
+import code.name.monkey.retromusic.repository.RoomPlaylistRepository
 import code.name.monkey.retromusic.db.SongEntity
 import code.name.monkey.retromusic.extensions.colorButtons
 import code.name.monkey.retromusic.extensions.extraNotNull
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreateRetroPlaylist.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreateRetroPlaylist.kt
index 74402ede..1b6f9867 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreateRetroPlaylist.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreateRetroPlaylist.kt
@@ -8,7 +8,7 @@ import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.RoomPlaylistRepository
+import code.name.monkey.retromusic.repository.RoomPlaylistRepository
 import code.name.monkey.retromusic.extensions.colorButtons
 import code.name.monkey.retromusic.extensions.materialDialog
 import code.name.monkey.retromusic.fragments.LibraryViewModel
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt
index ad50073c..2868a368 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt
@@ -10,7 +10,7 @@ import androidx.navigation.ui.NavigationUI
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity.getToolbarBackgroundColor
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.RoomPlaylistRepository
+import code.name.monkey.retromusic.repository.RoomPlaylistRepository
 import code.name.monkey.retromusic.dialogs.AddToRetroPlaylist
 import code.name.monkey.retromusic.extensions.findNavController
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
index 61ed911e..ab3a05fb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
@@ -17,7 +17,6 @@ package code.name.monkey.retromusic.repository
 import android.content.Context
 import code.name.monkey.retromusic.*
 import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.RoomPlaylistRepository
 import code.name.monkey.retromusic.model.*
 import code.name.monkey.retromusic.model.smartplaylist.NotPlayedPlaylist
 import code.name.monkey.retromusic.network.LastFMService
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/RoomPlaylistRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/RoomPlaylistRepository.kt
similarity index 86%
rename from app/src/main/java/code/name/monkey/retromusic/db/RoomPlaylistRepository.kt
rename to app/src/main/java/code/name/monkey/retromusic/repository/RoomPlaylistRepository.kt
index bdd7e0be..d303a861 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/RoomPlaylistRepository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/RoomPlaylistRepository.kt
@@ -1,6 +1,10 @@
-package code.name.monkey.retromusic.db
+package code.name.monkey.retromusic.repository
 
 import androidx.annotation.WorkerThread
+import code.name.monkey.retromusic.db.PlaylistDao
+import code.name.monkey.retromusic.db.PlaylistEntity
+import code.name.monkey.retromusic.db.PlaylistWithSongs
+import code.name.monkey.retromusic.db.SongEntity
 
 
 interface RoomPlaylistRepository {