diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 26f52498e..4d6e58db8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
         android:theme="@style/Theme.RetroMusic.FollowSystem"
         android:usesCleartextTraffic="false"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning"
-        tools:targetApi="m">
+        tools:targetApi="q">
         <activity
             android:name=".activities.MainActivity"
             android:label="@string/app_name"
diff --git a/app/src/main/java/io/github/muntashirakon/music/MainModule.kt b/app/src/main/java/io/github/muntashirakon/music/MainModule.kt
index 72a808366..1b6fc1fc4 100644
--- a/app/src/main/java/io/github/muntashirakon/music/MainModule.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/MainModule.kt
@@ -3,10 +3,10 @@ package io.github.muntashirakon.music
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
-import code.name.monkey.retromusic.db.BlackListStoreDao
-import code.name.monkey.retromusic.db.BlackListStoreEntity
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.RetroDatabase
+import io.github.muntashirakon.music.db.BlackListStoreDao
+import io.github.muntashirakon.music.db.BlackListStoreEntity
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.db.RetroDatabase
 import io.github.muntashirakon.music.fragments.LibraryViewModel
 import io.github.muntashirakon.music.fragments.albums.AlbumDetailsViewModel
 import io.github.muntashirakon.music.fragments.artists.ArtistDetailsViewModel
diff --git a/app/src/main/java/io/github/muntashirakon/music/activities/PermissionActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/PermissionActivity.kt
index b448836a1..2005a8f49 100644
--- a/app/src/main/java/io/github/muntashirakon/music/activities/PermissionActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/PermissionActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.activities
+package io.github.muntashirakon.music.activities
 
 import android.content.Intent
 import android.net.Uri
@@ -7,13 +7,12 @@ import android.provider.Settings
 import androidx.core.text.HtmlCompat
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.extensions.accentBackgroundColor
-import code.name.monkey.retromusic.extensions.show
-import code.name.monkey.retromusic.util.RingtoneManager
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.base.AbsMusicServiceActivity
+import io.github.muntashirakon.music.extensions.accentBackgroundColor
+import io.github.muntashirakon.music.extensions.show
+import io.github.muntashirakon.music.util.RingtoneManager
 import kotlinx.android.synthetic.main.activity_permission.*
-import kotlinx.android.synthetic.main.fragment_library.appNameText
 
 
 class PermissionActivity : AbsMusicServiceActivity() {
diff --git a/app/src/main/java/io/github/muntashirakon/music/adapter/playlist/LegacyPlaylistAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/playlist/LegacyPlaylistAdapter.kt
index c74c8a5f9..e6e04488d 100644
--- a/app/src/main/java/io/github/muntashirakon/music/adapter/playlist/LegacyPlaylistAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/playlist/LegacyPlaylistAdapter.kt
@@ -1,13 +1,13 @@
-package code.name.monkey.retromusic.adapter.playlist
+package io.github.muntashirakon.music.adapter.playlist
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.util.MusicUtil
+import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
+import io.github.muntashirakon.music.model.Playlist
+import io.github.muntashirakon.music.util.MusicUtil
 
 class LegacyPlaylistAdapter(
     private val activity: FragmentActivity,
diff --git a/app/src/main/java/io/github/muntashirakon/music/adapter/song/OrderablePlaylistSongAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/song/OrderablePlaylistSongAdapter.kt
index 88ab0eac0..8876309f6 100644
--- a/app/src/main/java/io/github/muntashirakon/music/adapter/song/OrderablePlaylistSongAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/song/OrderablePlaylistSongAdapter.kt
@@ -3,16 +3,16 @@ package io.github.muntashirakon.music.adapter.song
 import android.view.MenuItem
 import android.view.View
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.R.menu
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.db.toSongs
-import code.name.monkey.retromusic.dialogs.RemoveSongFromPlaylistDialog
-import code.name.monkey.retromusic.interfaces.CabHolder
-import code.name.monkey.retromusic.model.PlaylistSong
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.ViewUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.R.menu
+import io.github.muntashirakon.music.db.PlaylistEntity
+import io.github.muntashirakon.music.db.toSongEntity
+import io.github.muntashirakon.music.db.toSongs
+import io.github.muntashirakon.music.dialogs.RemoveSongFromPlaylistDialog
+import io.github.muntashirakon.music.interfaces.CabHolder
+import io.github.muntashirakon.music.model.PlaylistSong
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.ViewUtil
 import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
 import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemViewHolder
 import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreDao.kt b/app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreDao.kt
index db0dd0f64..b0efb794f 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreDao.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreDao.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.*
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreEntity.kt b/app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreEntity.kt
index 5ccbce07c..ef745e5ce 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreEntity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreEntity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/HistoryDao.kt b/app/src/main/java/io/github/muntashirakon/music/db/HistoryDao.kt
index 97288235d..f472f14b1 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/HistoryDao.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/HistoryDao.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.lifecycle.LiveData
 import androidx.room.*
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/HistoryEntity.kt b/app/src/main/java/io/github/muntashirakon/music/db/HistoryEntity.kt
index a4facd796..8f1b0ec96 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/HistoryEntity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/HistoryEntity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/LyricsDao.kt b/app/src/main/java/io/github/muntashirakon/music/db/LyricsDao.kt
index a09b430a2..ac922fe46 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/LyricsDao.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/LyricsDao.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.*
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/LyricsEntity.kt b/app/src/main/java/io/github/muntashirakon/music/db/LyricsEntity.kt
index 0cec6431c..e244dbdb5 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/LyricsEntity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/LyricsEntity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/PlayCountDao.kt b/app/src/main/java/io/github/muntashirakon/music/db/PlayCountDao.kt
index 4107b7ba5..facd5fa29 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/PlayCountDao.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/PlayCountDao.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.*
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/PlayCountEntity.kt b/app/src/main/java/io/github/muntashirakon/music/db/PlayCountEntity.kt
index 0fe6c0885..13768902a 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/PlayCountEntity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/PlayCountEntity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/PlaylistDao.kt b/app/src/main/java/io/github/muntashirakon/music/db/PlaylistDao.kt
index 36a4e8330..a90ba8664 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/PlaylistDao.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/PlaylistDao.kt
@@ -1,7 +1,10 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.lifecycle.LiveData
 import androidx.room.*
+import io.github.muntashirakon.music.db.PlaylistEntity
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.db.SongEntity
 
 @Dao
 interface PlaylistDao {
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/PlaylistEntity.kt b/app/src/main/java/io/github/muntashirakon/music/db/PlaylistEntity.kt
index 236e9cb40..bb5954973 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/PlaylistEntity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/PlaylistEntity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import android.os.Parcelable
 import androidx.room.ColumnInfo
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/PlaylistWithSongs.kt b/app/src/main/java/io/github/muntashirakon/music/db/PlaylistWithSongs.kt
index 5a256bde7..dff53e10c 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/PlaylistWithSongs.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/PlaylistWithSongs.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import android.os.Parcelable
 import androidx.room.Embedded
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/RetroDatabase.kt b/app/src/main/java/io/github/muntashirakon/music/db/RetroDatabase.kt
index 6be545b6a..3ec860ea1 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/RetroDatabase.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/RetroDatabase.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/SongEntity.kt b/app/src/main/java/io/github/muntashirakon/music/db/SongEntity.kt
index 6a6d236a3..d55237830 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/SongEntity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/SongEntity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import android.os.Parcelable
 import androidx.room.ColumnInfo
diff --git a/app/src/main/java/io/github/muntashirakon/music/db/SongExtension.kt b/app/src/main/java/io/github/muntashirakon/music/db/SongExtension.kt
index 03666f0a2..c59990470 100644
--- a/app/src/main/java/io/github/muntashirakon/music/db/SongExtension.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/SongExtension.kt
@@ -1,6 +1,6 @@
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.model.Song
 
 fun List<SongEntity>.toSongs(): List<Song> {
     return map {
diff --git a/app/src/main/java/io/github/muntashirakon/music/dialogs/ImportPlaylistDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/ImportPlaylistDialog.kt
index 359ef1c5b..e40ca35fe 100644
--- a/app/src/main/java/io/github/muntashirakon/music/dialogs/ImportPlaylistDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/ImportPlaylistDialog.kt
@@ -1,12 +1,12 @@
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.fragments.LibraryViewModel
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class ImportPlaylistDialog : DialogFragment() {
diff --git a/app/src/main/java/io/github/muntashirakon/music/dialogs/LyricsDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/LyricsDialog.kt
index 9c3b63c78..94942f2f4 100644
--- a/app/src/main/java/io/github/muntashirakon/music/dialogs/LyricsDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/LyricsDialog.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,12 +6,12 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.accentTextColor
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.network.Result
-import code.name.monkey.retromusic.repository.Repository
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.accentTextColor
+import io.github.muntashirakon.music.extensions.hide
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.network.Result
+import io.github.muntashirakon.music.repository.Repository
 import kotlinx.android.synthetic.main.lyrics_dialog.*
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
diff --git a/app/src/main/java/io/github/muntashirakon/music/dialogs/RemoveSongFromPlaylistDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/RemoveSongFromPlaylistDialog.kt
index b52e9fef5..ca364883f 100644
--- a/app/src/main/java/io/github/muntashirakon/music/dialogs/RemoveSongFromPlaylistDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/RemoveSongFromPlaylistDialog.kt
@@ -1,18 +1,18 @@
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_SONG
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.SongEntity
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType.Playlists
+import io.github.muntashirakon.music.EXTRA_SONG
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.SongEntity
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.extraNotNull
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.fragments.ReloadType.Playlists
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class RemoveSongFromPlaylistDialog : DialogFragment() {
diff --git a/app/src/main/java/io/github/muntashirakon/music/dialogs/SavePlaylistDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/SavePlaylistDialog.kt
index dd92a9a2d..a873c7c22 100644
--- a/app/src/main/java/io/github/muntashirakon/music/dialogs/SavePlaylistDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/SavePlaylistDialog.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
@@ -6,14 +6,14 @@ import android.widget.Toast
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.EXTRA_PLAYLIST
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.util.PlaylistsUtil
+import io.github.muntashirakon.music.App
+import io.github.muntashirakon.music.EXTRA_PLAYLIST
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.extraNotNull
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.util.PlaylistsUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
diff --git a/app/src/main/java/io/github/muntashirakon/music/extensions/CursorExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/CursorExtensions.kt
index 22c8e8667..310fe1e0c 100644
--- a/app/src/main/java/io/github/muntashirakon/music/extensions/CursorExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/CursorExtensions.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.database.Cursor
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/fragments/CoroutineViewModel.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/CoroutineViewModel.kt
index 9b6a5ca4c..75d82f411 100644
--- a/app/src/main/java/io/github/muntashirakon/music/fragments/CoroutineViewModel.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/CoroutineViewModel.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.fragments
+package io.github.muntashirakon.music.fragments
 
 import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.*
diff --git a/app/src/main/java/io/github/muntashirakon/music/glide/SingleColorTarget.kt b/app/src/main/java/io/github/muntashirakon/music/glide/SingleColorTarget.kt
index d4b2db1cc..a8cb77e8a 100644
--- a/app/src/main/java/io/github/muntashirakon/music/glide/SingleColorTarget.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/SingleColorTarget.kt
@@ -1,12 +1,12 @@
-package code.name.monkey.retromusic.glide
+package io.github.muntashirakon.music.glide
 
 import android.graphics.drawable.Drawable
 import android.widget.ImageView
 import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteTarget
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.util.ColorUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteTarget
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.util.ColorUtil
 import com.bumptech.glide.request.animation.GlideAnimation
 
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/model/CategoryInfo.kt b/app/src/main/java/io/github/muntashirakon/music/model/CategoryInfo.kt
index 978c2fe1b..d80afa051 100644
--- a/app/src/main/java/io/github/muntashirakon/music/model/CategoryInfo.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/CategoryInfo.kt
@@ -11,12 +11,12 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 import android.os.Parcelable
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import code.name.monkey.retromusic.R
+import io.github.muntashirakon.music.R
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/app/src/main/java/io/github/muntashirakon/music/model/PlaylistSong.kt b/app/src/main/java/io/github/muntashirakon/music/model/PlaylistSong.kt
index 8b7cbc00b..c2d1b8ad0 100644
--- a/app/src/main/java/io/github/muntashirakon/music/model/PlaylistSong.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/PlaylistSong.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 import kotlinx.android.parcel.Parcelize
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/model/Song.kt b/app/src/main/java/io/github/muntashirakon/music/model/Song.kt
index 201f22c5c..0f084754a 100644
--- a/app/src/main/java/io/github/muntashirakon/music/model/Song.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/Song.kt
@@ -14,8 +14,6 @@
 package io.github.muntashirakon.music.model
 
 import android.os.Parcelable
-import code.name.monkey.retromusic.db.HistoryEntity
-import code.name.monkey.retromusic.db.SongEntity
 import kotlinx.android.parcel.Parcelize
 
 // update equals and hashcode if fields changes
diff --git a/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/PlaylistIdGenerator.kt b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/PlaylistIdGenerator.kt
index f81ceb6c7..baf6867ce 100644
--- a/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/PlaylistIdGenerator.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/PlaylistIdGenerator.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.model.smartplaylist
+package io.github.muntashirakon.music.model.smartplaylist
 
 import androidx.annotation.DrawableRes
 import kotlin.math.abs
diff --git a/app/src/main/java/io/github/muntashirakon/music/network/LyricsService.kt b/app/src/main/java/io/github/muntashirakon/music/network/LyricsService.kt
index 0a0e04904..33314805f 100644
--- a/app/src/main/java/io/github/muntashirakon/music/network/LyricsService.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/network/LyricsService.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.network
+package io.github.muntashirakon.music.network
 
 import retrofit2.http.GET
 import retrofit2.http.Headers
diff --git a/app/src/main/java/io/github/muntashirakon/music/network/conversion/LyricsConverterFactory.kt b/app/src/main/java/io/github/muntashirakon/music/network/conversion/LyricsConverterFactory.kt
index 474e81c99..ccda66c9c 100644
--- a/app/src/main/java/io/github/muntashirakon/music/network/conversion/LyricsConverterFactory.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/network/conversion/LyricsConverterFactory.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.network.conversion
+package io.github.muntashirakon.music.network.conversion
 
 import okhttp3.MediaType
 import okhttp3.RequestBody
diff --git a/app/src/main/java/io/github/muntashirakon/music/repository/RoomRepository.kt b/app/src/main/java/io/github/muntashirakon/music/repository/RoomRepository.kt
index 4a6eb42d2..e42bff6b5 100644
--- a/app/src/main/java/io/github/muntashirakon/music/repository/RoomRepository.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/RoomRepository.kt
@@ -1,9 +1,10 @@
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import androidx.annotation.WorkerThread
 import androidx.lifecycle.LiveData
-import code.name.monkey.retromusic.db.*
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.db.*
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.db.*
 
 
 interface RoomRepository {
diff --git a/app/src/main/java/io/github/muntashirakon/music/repository/SongRepository.kt b/app/src/main/java/io/github/muntashirakon/music/repository/SongRepository.kt
index 6bcac171f..46cae7a45 100644
--- a/app/src/main/java/io/github/muntashirakon/music/repository/SongRepository.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/SongRepository.kt
@@ -150,7 +150,7 @@ class RealSongRepository(private val context: Context) : SongRepository {
             selectionFinal + " AND " + Media.DURATION + ">= " + (PreferenceUtil.filterLength * 1000)
 
         return context.contentResolver.query(
-            Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY),
+            Media.getContentUri(MediaStore.VOLUME_EXTERNAL),
             baseProjection,
             selectionFinal,
             selectionValuesFinal,
diff --git a/app/src/main/java/io/github/muntashirakon/music/util/ColorUtil.java b/app/src/main/java/io/github/muntashirakon/music/util/ColorUtil.java
index e4133392c..030913100 100644
--- a/app/src/main/java/io/github/muntashirakon/music/util/ColorUtil.java
+++ b/app/src/main/java/io/github/muntashirakon/music/util/ColorUtil.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.util;
+package io.github.muntashirakon.music.util;
 
 import android.graphics.Bitmap;
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/util/FilePathUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/FilePathUtil.kt
index da30e71c9..048a0f8e2 100644
--- a/app/src/main/java/io/github/muntashirakon/music/util/FilePathUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/FilePathUtil.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.os.Environment
 import java.io.File
diff --git a/app/src/main/java/io/github/muntashirakon/music/views/AccentIcon.kt b/app/src/main/java/io/github/muntashirakon/music/views/AccentIcon.kt
index c48c3c417..5417cb7e5 100644
--- a/app/src/main/java/io/github/muntashirakon/music/views/AccentIcon.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/AccentIcon.kt
@@ -1,10 +1,10 @@
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.content.res.ColorStateList
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
-import code.name.monkey.retromusic.extensions.accentColor
+import io.github.muntashirakon.music.extensions.accentColor
 
 class AccentIcon @JvmOverloads constructor(
     context: Context,
diff --git a/app/src/main/java/io/github/muntashirakon/music/views/PermissionItem.kt b/app/src/main/java/io/github/muntashirakon/music/views/PermissionItem.kt
index 7e627f242..c6252b48d 100644
--- a/app/src/main/java/io/github/muntashirakon/music/views/PermissionItem.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/PermissionItem.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.content.res.ColorStateList
@@ -6,8 +6,8 @@ import android.util.AttributeSet
 import android.widget.FrameLayout
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.accentOutlineColor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.accentOutlineColor
 import kotlinx.android.synthetic.main.item_permission.view.*
 
 class PermissionItem @JvmOverloads constructor(
diff --git a/app/src/main/res/layout/activity_permission.xml b/app/src/main/res/layout/activity_permission.xml
index 784da5c4b..8ed55740f 100644
--- a/app/src/main/res/layout/activity_permission.xml
+++ b/app/src/main/res/layout/activity_permission.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="?attr/colorSurface">
 
-    <code.name.monkey.retromusic.views.BaselineGridTextView
+    <io.github.muntashirakon.music.views.BaselineGridTextView
         android:id="@+id/appNameText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/appNameText" />
 
-    <code.name.monkey.retromusic.views.PermissionItem
+    <io.github.muntashirakon.music.views.PermissionItem
         android:id="@+id/storagePermission"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
         app:permissionTitleNumber="1"
         app:permissionTitleSubTitle="The app needs permission to access your device storage for music files playing music" />
 
-    <code.name.monkey.retromusic.views.PermissionItem
+    <io.github.muntashirakon.music.views.PermissionItem
         android:id="@+id/audioPermission"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_permission.xml b/app/src/main/res/layout/item_permission.xml
index 1901dca8c..81ff7dbd8 100644
--- a/app/src/main/res/layout/item_permission.xml
+++ b/app/src/main/res/layout/item_permission.xml
@@ -38,7 +38,7 @@
         tools:maxLines="@string/grid_size_1"
         tools:text="@tools:sample/lorem/random" />
 
-    <code.name.monkey.retromusic.views.BaselineGridTextView
+    <io.github.muntashirakon.music.views.BaselineGridTextView
         android:id="@+id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/section_recycler_view.xml b/app/src/main/res/layout/section_recycler_view.xml
index a86a9cc01..4b7acdd5d 100644
--- a/app/src/main/res/layout/section_recycler_view.xml
+++ b/app/src/main/res/layout/section_recycler_view.xml
@@ -29,7 +29,7 @@
             android:textStyle="bold"
             tools:text="@tools:sample/full_names" />
 
-        <code.name.monkey.retromusic.views.AccentIcon
+        <io.github.muntashirakon.music.views.AccentIcon
             android:id="@+id/arrow"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"