diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 78e3f078..c0e2639d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:theme="@style/Theme.RetroMusic.Light"
         android:usesCleartextTraffic="false">
         <activity
-            android:name=".ui.activities.MainActivity"
+            android:name="code.name.monkey.retromusic.activities.MainActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -84,36 +84,36 @@
                 <data android:mimeType="vnd.android.cursor.dir/audio" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.activities.AlbumDetailsActivity" />
-        <activity android:name=".ui.activities.ArtistDetailActivity" />
-        <activity android:name=".ui.activities.PlaylistDetailActivity" />
-        <activity android:name=".ui.activities.PlayingQueueActivity" />
-        <activity android:name=".ui.activities.AboutActivity" />
-        <activity android:name=".ui.activities.tageditor.AlbumTagEditorActivity" />
-        <activity android:name=".ui.activities.tageditor.SongTagEditorActivity" />
-        <activity android:name=".ui.activities.SettingsActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.AlbumDetailsActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.ArtistDetailActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.PlaylistDetailActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.PlayingQueueActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.AboutActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.tageditor.AlbumTagEditorActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.SettingsActivity" />
         <activity
-            android:name=".ui.activities.SearchActivity"
+            android:name="code.name.monkey.retromusic.activities.SearchActivity"
             android:windowSoftInputMode="stateVisible" />
-        <activity android:name=".ui.activities.LyricsActivity" />
-        <activity android:name=".ui.activities.UserInfoActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.LyricsActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.UserInfoActivity" />
 
-        <activity android:name=".ui.activities.SupportDevelopmentActivity" />
-        <activity android:name=".ui.activities.GenreDetailsActivity" />
-        <activity android:name=".ui.activities.LicenseActivity" />
-        <activity android:name=".ui.activities.PurchaseActivity" />
-        <activity android:name=".ui.activities.EqualizerActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.SupportDevelopmentActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.GenreDetailsActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.LicenseActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.PurchaseActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.EqualizerActivity" />
         <activity
-            android:name=".ui.activities.bugreport.ErrorHandlerActivity"
+            android:name="code.name.monkey.retromusic.activities.bugreport.ErrorHandlerActivity"
             android:immersive="true"
             android:label="@string/error"
             android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:theme="@style/ErrorHandlingTheme" />
-        <activity android:name=".ui.activities.WhatsNewActivity" />
-        <activity android:name=".ui.activities.bugreport.BugReportActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.WhatsNewActivity" />
+        <activity android:name="code.name.monkey.retromusic.activities.bugreport.BugReportActivity" />
         <activity
-            android:name=".ui.activities.LockScreenActivity"
+            android:name="code.name.monkey.retromusic.activities.LockScreenActivity"
             android:noHistory="true"
             android:screenOrientation="portrait"
             android:showOnLockScreen="true" />
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt
index fc3bd753..119636c0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -23,8 +23,8 @@ import code.name.monkey.retromusic.Constants.TELEGRAM_CHANGE_LOG
 import code.name.monkey.retromusic.Constants.TRANSLATE
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.model.Contributor
-import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity
-import code.name.monkey.retromusic.ui.adapter.ContributorAdapter
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.adapter.ContributorAdapter
 import code.name.monkey.retromusic.util.NavigationUtil
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.list.listItems
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
index 7c4d47fd..e195b77a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.content.Intent
 import android.content.res.ColorStateList
@@ -32,11 +32,11 @@ import code.name.monkey.retromusic.misc.AppBarStateChangeListener
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.mvp.contract.AlbumDetailsContract
 import code.name.monkey.retromusic.mvp.presenter.AlbumDetailsPresenter
-import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.ui.activities.tageditor.AbsTagEditorActivity
-import code.name.monkey.retromusic.ui.activities.tageditor.AlbumTagEditorActivity
-import code.name.monkey.retromusic.ui.adapter.album.HorizontalAlbumAdapter
-import code.name.monkey.retromusic.ui.adapter.song.SimpleSongAdapter
+import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
+import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
+import code.name.monkey.retromusic.activities.tageditor.AlbumTagEditorActivity
+import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
+import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt
index 8389410b..ded4bf05 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.app.Activity
 import android.content.Intent
@@ -34,10 +34,10 @@ import code.name.monkey.retromusic.mvp.contract.ArtistDetailContract
 import code.name.monkey.retromusic.mvp.presenter.ArtistDetailsPresenter
 import code.name.monkey.retromusic.rest.LastFMRestClient
 import code.name.monkey.retromusic.rest.model.LastFmArtist
-import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.ui.adapter.album.AlbumAdapter
-import code.name.monkey.retromusic.ui.adapter.album.HorizontalAlbumAdapter
-import code.name.monkey.retromusic.ui.adapter.song.SimpleSongAdapter
+import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
+import code.name.monkey.retromusic.adapter.album.AlbumAdapter
+import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
+import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
 import code.name.monkey.retromusic.util.*
 import com.google.android.material.appbar.AppBarLayout
 import kotlinx.android.synthetic.main.activity_artist_content.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/EqualizerActivity.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/EqualizerActivity.kt
index 70546c13..7a6a240b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/EqualizerActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.os.Bundle
 import android.transition.TransitionManager
@@ -16,7 +16,7 @@ import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.EqualizerHelper
-import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.util.ViewUtil
 import kotlinx.android.synthetic.main.activity_equalizer.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
index 60bdfe95..ca2c94e1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.content.res.ColorStateList
 import android.graphics.Color
@@ -21,8 +21,8 @@ import code.name.monkey.retromusic.model.Genre
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.mvp.contract.GenreDetailsContract
 import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter
-import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.ui.adapter.song.SongAdapter
+import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
+import code.name.monkey.retromusic.adapter.song.SongAdapter
 import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import com.afollestad.materialcab.MaterialCab
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt
index b88d27da..8fda93fe 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt
@@ -1,11 +1,11 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.os.Bundle
 import android.view.MenuItem
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import kotlinx.android.synthetic.main.activity_license.*
 
 class LicenseActivity : AbsBaseActivity() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LockScreenActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/LockScreenActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
index f7f1583a..667142a9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LockScreenActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.app.KeyguardManager
 import android.content.Context
@@ -13,8 +13,8 @@ import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.ui.fragments.player.lockscreen.LockScreenPlayerControlsFragment
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
+import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenPlayerControlsFragment
 import com.r0adkll.slidr.Slidr
 import com.r0adkll.slidr.model.SlidrConfig
 import com.r0adkll.slidr.model.SlidrListener
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt
index 8feba415..50fe5088 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
@@ -26,9 +26,9 @@ import code.name.monkey.retromusic.lyrics.LrcHelper
 import code.name.monkey.retromusic.lyrics.LrcView
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.model.lyrics.Lyrics
-import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.ui.activities.tageditor.WriteTagsAsyncTask
-import code.name.monkey.retromusic.ui.fragments.base.AbsMusicServiceFragment
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
+import code.name.monkey.retromusic.activities.tageditor.WriteTagsAsyncTask
+import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
 import code.name.monkey.retromusic.util.LyricUtil
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
index 47efefc6..43d52d0f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.annotation.SuppressLint
 import android.content.*
@@ -19,9 +19,9 @@ import code.name.monkey.retromusic.loaders.AlbumLoader
 import code.name.monkey.retromusic.loaders.ArtistLoader
 import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.ui.fragments.mainactivity.LibraryFragment
-import code.name.monkey.retromusic.ui.fragments.mainactivity.home.BannerHomeFragment
+import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
+import code.name.monkey.retromusic.fragments.mainactivity.LibraryFragment
+import code.name.monkey.retromusic.fragments.mainactivity.home.BannerHomeFragment
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import io.reactivex.disposables.CompositeDisposable
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt
index cf385135..c1399ee6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.content.res.ColorStateList
 import android.os.Bundle
@@ -10,8 +10,8 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.ui.adapter.song.PlayingQueueAdapter
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
+import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
 import code.name.monkey.retromusic.util.MusicUtil
 import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt
index 998eb81e..606a4d0b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.content.res.ColorStateList
 import android.graphics.Color
@@ -22,10 +22,10 @@ import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.mvp.contract.PlaylistSongsContract
 import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsPresenter
-import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.ui.adapter.song.OrderablePlaylistSongAdapter
-import code.name.monkey.retromusic.ui.adapter.song.PlaylistSongAdapter
-import code.name.monkey.retromusic.ui.adapter.song.SongAdapter
+import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
+import code.name.monkey.retromusic.adapter.song.OrderablePlaylistSongAdapter
+import code.name.monkey.retromusic.adapter.song.PlaylistSongAdapter
+import code.name.monkey.retromusic.adapter.song.SongAdapter
 import code.name.monkey.retromusic.util.PlaylistsUtil
 import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.ViewUtil
@@ -33,7 +33,6 @@ import com.afollestad.materialcab.MaterialCab
 import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
 import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
-import kotlinx.android.synthetic.main.abs_playlists.*
 import kotlinx.android.synthetic.main.activity_playlist_detail.*
 import java.util.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PurchaseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/PurchaseActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
index e567838e..13b02a12 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PurchaseActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.content.Intent
 import android.os.AsyncTask
@@ -12,7 +12,7 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.BuildConfig
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import com.anjlab.android.iab.v3.BillingProcessor
 import com.anjlab.android.iab.v3.TransactionDetails
 import kotlinx.android.synthetic.main.activity_pro_version.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt
index 15c68b4a..66bf5195 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.app.Activity
 import android.app.SearchManager
@@ -24,8 +24,8 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.mvp.contract.SearchContract
 import code.name.monkey.retromusic.mvp.presenter.SearchPresenter
-import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.ui.adapter.SearchAdapter
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
+import code.name.monkey.retromusic.adapter.SearchAdapter
 import code.name.monkey.retromusic.util.RetroUtil
 import kotlinx.android.synthetic.main.activity_search.*
 import java.util.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
index cf5524ba..21d0ca72 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.content.SharedPreferences
 import android.os.Bundle
@@ -8,8 +8,8 @@ import androidx.fragment.app.Fragment
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity
-import code.name.monkey.retromusic.ui.fragments.settings.MainSettingsFragment
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.fragments.settings.MainSettingsFragment
 import code.name.monkey.retromusic.util.PreferenceUtil
 import kotlinx.android.synthetic.main.activity_settings.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt
index 2611d338..99aad4dd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.content.Intent
 import android.graphics.Paint
@@ -21,7 +21,7 @@ import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.BuildConfig
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.views.IconImageView
 import com.anjlab.android.iab.v3.BillingProcessor
 import com.anjlab.android.iab.v3.SkuDetails
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt
index 1bfee840..d3ab30e1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities
+package code.name.monkey.retromusic.activities
 
 import android.app.Activity
 import android.content.*
@@ -19,9 +19,8 @@ import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.Constants.USER_BANNER
 import code.name.monkey.retromusic.Constants.USER_PROFILE
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.util.Compressor
-import code.name.monkey.retromusic.util.ImageUtil
 import code.name.monkey.retromusic.util.ImageUtil.getResizedBitmap
 import code.name.monkey.retromusic.util.PreferenceUtil
 import com.afollestad.materialdialogs.MaterialDialog
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/WhatsNewActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/WhatsNewActivity.java
rename to app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java
index f7f2081a..005ac559 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/WhatsNewActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities;
+package code.name.monkey.retromusic.activities;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -15,14 +15,13 @@ import java.io.InputStreamReader;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.LinearSmoothScroller;
-import androidx.recyclerview.widget.RecyclerView;
+
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
 import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity;
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 
 public class WhatsNewActivity extends AbsBaseActivity {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt
index 16685b3f..13f3f368 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt
@@ -1,7 +1,6 @@
-package code.name.monkey.retromusic.ui.activities.base
+package code.name.monkey.retromusic.activities.base
 
 import android.Manifest
-import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.media.AudioManager
@@ -14,7 +13,6 @@ import android.view.View
 import androidx.core.app.ActivityCompat
 import code.name.monkey.appthemehelper.ThemeStore
 import com.google.android.material.snackbar.Snackbar
-import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper
 
 
 abstract class AbsBaseActivity : AbsThemeActivity() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsCrashCollector.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsCrashCollector.kt
similarity index 86%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsCrashCollector.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/base/AbsCrashCollector.kt
index 3eee75ea..9bd0575d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsCrashCollector.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsCrashCollector.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.base
+package code.name.monkey.retromusic.activities.base
 
 import android.os.Bundle
 import code.name.monkey.appthemehelper.ATHActivity
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsMusicServiceActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsMusicServiceActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
index a51024b1..893c65e8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsMusicServiceActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.base
+package code.name.monkey.retromusic.activities.base
 
 import android.Manifest
 import android.content.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
similarity index 89%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
index c1ec9306..669e8fa8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.base
+package code.name.monkey.retromusic.activities.base
 
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
@@ -12,23 +12,23 @@ import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.ui.fragments.MiniPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen
-import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen.*
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.adaptive.AdaptiveFragment
-import code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.card.CardFragment
-import code.name.monkey.retromusic.ui.fragments.player.cardblur.CardBlurFragment
-import code.name.monkey.retromusic.ui.fragments.player.color.ColorFragment
-import code.name.monkey.retromusic.ui.fragments.player.fit.FitFragment
-import code.name.monkey.retromusic.ui.fragments.player.flat.FlatPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.full.FullPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.material.MaterialFragment
-import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.plain.PlainPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.simple.SimplePlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.tiny.TinyPlayerFragment
+import code.name.monkey.retromusic.fragments.MiniPlayerFragment
+import code.name.monkey.retromusic.fragments.NowPlayingScreen
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.adaptive.AdaptiveFragment
+import code.name.monkey.retromusic.fragments.player.blur.BlurPlayerFragment
+import code.name.monkey.retromusic.fragments.player.card.CardFragment
+import code.name.monkey.retromusic.fragments.player.cardblur.CardBlurFragment
+import code.name.monkey.retromusic.fragments.player.color.ColorFragment
+import code.name.monkey.retromusic.fragments.player.fit.FitFragment
+import code.name.monkey.retromusic.fragments.player.flat.FlatPlayerFragment
+import code.name.monkey.retromusic.fragments.player.full.FullPlayerFragment
+import code.name.monkey.retromusic.fragments.player.material.MaterialFragment
+import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
+import code.name.monkey.retromusic.fragments.player.plain.PlainPlayerFragment
+import code.name.monkey.retromusic.fragments.player.simple.SimplePlayerFragment
+import code.name.monkey.retromusic.fragments.player.tiny.TinyPlayerFragment
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.views.BottomNavigationBarTinted
 import com.sothree.slidinguppanel.SlidingUpPanelLayout
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
index 6948b909..64e87c09 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.base
+package code.name.monkey.retromusic.activities.base
 
 import android.graphics.Color
 import android.graphics.drawable.Drawable
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/BugReportActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/BugReportActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt
index b24df74c..98a3d4ed 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/BugReportActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.bugreport
+package code.name.monkey.retromusic.activities.bugreport
 
 import android.app.Activity
 import android.app.Dialog
@@ -19,12 +19,12 @@ import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.misc.DialogAsyncTask
-import code.name.monkey.retromusic.ui.activities.base.AbsThemeActivity
-import code.name.monkey.retromusic.ui.activities.bugreport.model.DeviceInfo
-import code.name.monkey.retromusic.ui.activities.bugreport.model.Report
-import code.name.monkey.retromusic.ui.activities.bugreport.model.github.ExtraInfo
-import code.name.monkey.retromusic.ui.activities.bugreport.model.github.GithubLogin
-import code.name.monkey.retromusic.ui.activities.bugreport.model.github.GithubTarget
+import code.name.monkey.retromusic.activities.base.AbsThemeActivity
+import code.name.monkey.retromusic.activities.bugreport.model.DeviceInfo
+import code.name.monkey.retromusic.activities.bugreport.model.Report
+import code.name.monkey.retromusic.activities.bugreport.model.github.ExtraInfo
+import code.name.monkey.retromusic.activities.bugreport.model.github.GithubLogin
+import code.name.monkey.retromusic.activities.bugreport.model.github.GithubTarget
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.callbacks.onCancel
 import com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/ErrorHandlerActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/ErrorHandlerActivity.kt
new file mode 100644
index 00000000..73765329
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/ErrorHandlerActivity.kt
@@ -0,0 +1 @@
+package code.name.monkey.retromusic.activities.bugreport

import android.content.ActivityNotFoundException
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.activities.bugreport.model.DeviceInfo
import kotlinx.android.synthetic.main.activity_error_handler.*


class ErrorHandlerActivity : AppCompatActivity() {
    private var deviceInfo: DeviceInfo? = null
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_error_handler)

        deviceInfo = DeviceInfo(this)

        clearAppData.setOnClickListener {
            try {
                val intent = Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
                intent.data = Uri.parse("package:$packageName")
                startActivity(intent)
            } catch (e: ActivityNotFoundException) {
                val intent = Intent(android.provider.Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS)
                startActivity(intent)
            }
        }

        sendCrashLog.setOnClickListener {
            val sendIntent = Intent(Intent.ACTION_SEND)
            val subject = "Error report"
            val body = intent.getStringExtra("error") + "\n" + deviceInfo!!.toString()

            sendIntent.putExtra(Intent.EXTRA_EMAIL, arrayOf("monkeycodeapp@gmail.com"))
            sendIntent.putExtra(Intent.EXTRA_TEXT, body)
            sendIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
            sendIntent.type = "message/rfc822"

            startActivity(Intent.createChooser(sendIntent, "Send crash log"))
            deleteFile("stack.trace")
        }

        showCrashError.text = String.format("%s", intent.getStringExtra("error"))
        showCrashError.append(deviceInfo!!.toString())
    }
}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/DeviceInfo.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/DeviceInfo.java
rename to app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java
index 6dabfa86..dd5d5463 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/DeviceInfo.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.bugreport.model;
+package code.name.monkey.retromusic.activities.bugreport.model;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/Report.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/Report.java
similarity index 82%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/Report.java
rename to app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/Report.java
index b4ef3532..4549693f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/Report.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/Report.java
@@ -1,7 +1,7 @@
-package code.name.monkey.retromusic.ui.activities.bugreport.model;
+package code.name.monkey.retromusic.activities.bugreport.model;
 
 
-import code.name.monkey.retromusic.ui.activities.bugreport.model.github.ExtraInfo;
+import code.name.monkey.retromusic.activities.bugreport.model.github.ExtraInfo;
 
 public class Report {
     private final String title;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/ExtraInfo.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/ExtraInfo.java
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/ExtraInfo.java
rename to app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/ExtraInfo.java
index 44610d88..c9bedfa6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/ExtraInfo.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/ExtraInfo.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.bugreport.model.github;
+package code.name.monkey.retromusic.activities.bugreport.model.github;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/GithubLogin.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubLogin.java
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/GithubLogin.java
rename to app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubLogin.java
index 5ddab5ed..a2d147ee 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/GithubLogin.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubLogin.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.bugreport.model.github;
+package code.name.monkey.retromusic.activities.bugreport.model.github;
 
 import android.text.TextUtils;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/GithubTarget.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubTarget.java
similarity index 83%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/GithubTarget.java
rename to app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubTarget.java
index 8e6acc2a..4bea98be 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/GithubTarget.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubTarget.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.bugreport.model.github;
+package code.name.monkey.retromusic.activities.bugreport.model.github;
 
 public class GithubTarget {
     private final String username;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
index 6acbb320..5d3134cb 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.tageditor
+package code.name.monkey.retromusic.activities.tageditor
 
 import android.app.Activity
 import android.app.SearchManager
@@ -17,7 +17,7 @@ import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.util.RetroUtil
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.list.listItems
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
index cc9c02d7..c9778a40 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.tageditor
+package code.name.monkey.retromusic.activities.tageditor
 
 import android.app.Activity
 import android.content.res.ColorStateList
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
index 4fbf4296..65075528 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.tageditor
+package code.name.monkey.retromusic.activities.tageditor
 
 import android.net.Uri
 import android.os.Bundle
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/WriteTagsAsyncTask.java b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/WriteTagsAsyncTask.java
rename to app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java
index 40b8edaa..9648fdd6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/WriteTagsAsyncTask.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.activities.tageditor;
+package code.name.monkey.retromusic.activities.tageditor;
 
 import android.app.Activity;
 import android.app.Dialog;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/CollageSongAdapter.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/CollageSongAdapter.kt
index ac697368..ef2dac03 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/CollageSongAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter
+package code.name.monkey.retromusic.adapter
 
 import android.app.Activity
 import android.view.LayoutInflater
@@ -16,8 +16,8 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.adapter.CollageSongAdapter.CollageSongViewHolder
-import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.adapter.CollageSongAdapter.CollageSongViewHolder
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import java.util.*
 
 /**
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/ContributorAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/ContributorAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt
index 74e2fb02..880d34e4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/ContributorAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter
+package code.name.monkey.retromusic.adapter
 
 import android.app.Activity
 import android.view.LayoutInflater
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
index b7f780ad..60839503 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter
+package code.name.monkey.retromusic.adapter
 
 import android.app.Activity
 import android.view.LayoutInflater
@@ -10,7 +10,7 @@ import java.util.Locale
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.util.NavigationUtil
 
 /**
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/HomeAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
index 7f5e8e52..2ac647d8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/HomeAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter
+package code.name.monkey.retromusic.adapter
 
 import android.util.DisplayMetrics
 import android.view.LayoutInflater
@@ -22,9 +22,9 @@ import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
 import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.ui.adapter.album.AlbumFullWidthAdapter
-import code.name.monkey.retromusic.ui.adapter.artist.ArtistAdapter
-import code.name.monkey.retromusic.ui.adapter.song.SongAdapter
+import code.name.monkey.retromusic.adapter.album.AlbumFullWidthAdapter
+import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
+import code.name.monkey.retromusic.adapter.song.SongAdapter
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.views.IconImageView
 import code.name.monkey.retromusic.views.MetalRecyclerViewPager
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
index 8b95dd62..64a8f3d8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter
+package code.name.monkey.retromusic.adapter
 
 import android.view.LayoutInflater
 import android.view.View
@@ -15,7 +15,7 @@ import code.name.monkey.retromusic.helper.menu.SongMenuHelper
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.NavigationUtil
 import java.util.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SongFileAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/SongFileAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt
index 44411953..e3c18089 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SongFileAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter
+package code.name.monkey.retromusic.adapter
 
 import android.graphics.PorterDuff
 import android.graphics.drawable.Drawable
@@ -13,8 +13,8 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
 import code.name.monkey.retromusic.interfaces.CabHolder
-import code.name.monkey.retromusic.ui.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.util.RetroUtil
 import com.bumptech.glide.GenericTransitionOptions
 import com.bumptech.glide.load.engine.DiskCacheStrategy
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SpanSongsAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SpanSongsAdapter.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/SpanSongsAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/SpanSongsAdapter.kt
index f0b01396..313f65c2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SpanSongsAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SpanSongsAdapter.kt
@@ -1,10 +1,10 @@
-package code.name.monkey.retromusic.ui.adapter
+package code.name.monkey.retromusic.adapter
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.adapter.song.SongAdapter
+import code.name.monkey.retromusic.adapter.song.SongAdapter
 import java.util.*
 
 class SpanSongsAdapter(activity: AppCompatActivity, dataSet: ArrayList<Song>, itemLayoutRes: Int, usePalette: Boolean, cabHolder: CabHolder?) : SongAdapter(activity, dataSet, itemLayoutRes, usePalette, cabHolder) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
index a749fb16..3bf36fdd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.album
+package code.name.monkey.retromusic.adapter.album
 
 import android.content.res.ColorStateList
 import android.graphics.drawable.Drawable
@@ -21,8 +21,8 @@ import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
index f4d7b63a..5015db01 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.album
+package code.name.monkey.retromusic.adapter.album
 
 import android.content.Intent
 import android.graphics.drawable.Drawable
@@ -15,8 +15,8 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.misc.CustomFragmentStatePagerAdapter
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.activities.LyricsActivity
-import code.name.monkey.retromusic.ui.fragments.AlbumCoverStyle
+import code.name.monkey.retromusic.activities.LyricsActivity
+import code.name.monkey.retromusic.fragments.AlbumCoverStyle
 import code.name.monkey.retromusic.util.PreferenceUtil
 import java.util.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWidthAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWidthAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt
index f7ef05fa..ea4407e8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWidthAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package code.name.monkey.retromusic.ui.adapter.album
+package code.name.monkey.retromusic.adapter.album
 
 import android.app.Activity
 import android.util.DisplayMetrics
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
index d3b63896..d95b659b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.album
+package code.name.monkey.retromusic.adapter.album
 
 import android.graphics.drawable.Drawable
 import android.view.View
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
index 605649ec..7d5adf9f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.artist
+package code.name.monkey.retromusic.adapter.artist
 
 import android.content.res.ColorStateList
 import android.view.LayoutInflater
@@ -19,8 +19,8 @@ import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.NavigationUtil
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/AbsMultiSelectAdapter.java b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/AbsMultiSelectAdapter.java
rename to app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java
index 6718654e..f184337b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/AbsMultiSelectAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.base;
+package code.name.monkey.retromusic.adapter.base;
 
 import android.content.Context;
 import androidx.annotation.MenuRes;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt
index 2749ab98..408f1b75 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt
@@ -1,6 +1,5 @@
-package code.name.monkey.retromusic.ui.adapter.base
+package code.name.monkey.retromusic.adapter.base
 
-import android.graphics.Color
 import android.os.Build
 import android.view.View
 import android.view.ViewGroup
@@ -11,7 +10,6 @@ import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.R
-import com.google.android.material.card.MaterialCardView
 
 open class MediaEntryViewHolder(view: View) : RecyclerView.ViewHolder(view), View.OnClickListener, View.OnLongClickListener {
     override fun onLongClick(v: View?): Boolean {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/AddToPlaylist.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/AddToPlaylist.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/AddToPlaylist.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/playlist/AddToPlaylist.kt
index f85746ee..684270ba 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/AddToPlaylist.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/AddToPlaylist.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.playlist
+package code.name.monkey.retromusic.adapter.playlist
 
 import android.app.Activity
 import android.app.Dialog
@@ -10,8 +10,8 @@ import java.util.ArrayList
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.ui.adapter.playlist.AddToPlaylist.ViewHolder
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.adapter.playlist.AddToPlaylist.ViewHolder
 import code.name.monkey.retromusic.util.PlaylistsUtil
 
 class AddToPlaylist(private val activity: Activity,
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
index 832baa5e..e8465c09 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.playlist
+package code.name.monkey.retromusic.adapter.playlist
 
 import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
@@ -23,8 +23,8 @@ import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
 import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
-import code.name.monkey.retromusic.ui.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.NavigationUtil
 import java.util.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt
index 935867e7..98a0f5ae 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/OrderablePlaylistSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/OrderablePlaylistSongAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
index 87b68f15..88f78b8b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/OrderablePlaylistSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.view.MenuItem
 import android.view.View
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
index 3dd00b10..eaaf686e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.graphics.Color
 import android.graphics.PorterDuff
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt
index fcc6f1c8..b39a0823 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.view.MenuItem
 import android.view.View
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/ShuffleButtonSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/ShuffleButtonSongAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
index 48607586..f5a16bc3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/ShuffleButtonSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.view.View
 import androidx.annotation.LayoutRes
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SimpleSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SimpleSongAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
index 7c2e680a..ccf13a5a 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SimpleSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.kt
rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
index 6164bfd9..3ebef434 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
@@ -21,8 +21,8 @@ import code.name.monkey.retromusic.helper.menu.SongMenuHelper
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt
index d514484c..9be37e02 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt
@@ -29,7 +29,7 @@ import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
 import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist
 import code.name.monkey.retromusic.model.smartplaylist.ShuffleAllPlaylist
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.activities.SearchActivity
+import code.name.monkey.retromusic.activities.SearchActivity
 
 
 class AppShortcutLauncherActivity : Activity() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt
index f3eee925..f3f7d4f4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt
@@ -31,7 +31,7 @@ import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroSimpleTarget
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.activities.MainActivity
+import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.util.RetroUtil
 import com.bumptech.glide.request.target.Target
 import com.bumptech.glide.request.transition.Transition
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt
index f5e70cd8..a23d2589 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt
@@ -32,7 +32,7 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroSimpleTarget
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.activities.MainActivity
+import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.util.RetroUtil
 import com.bumptech.glide.request.target.Target
 import com.bumptech.glide.request.transition.Transition
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt
index ff27a6d7..c63a27ad 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt
@@ -32,7 +32,7 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroSimpleTarget
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.activities.MainActivity
+import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.util.RetroUtil
 import com.bumptech.glide.request.target.Target
 import com.bumptech.glide.request.transition.Transition
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt
index 31e36909..bc2a765d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt
@@ -32,7 +32,7 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroSimpleTarget
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.activities.MainActivity
+import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.util.RetroUtil
 import com.bumptech.glide.request.target.Target
 import com.bumptech.glide.request.transition.Transition
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt
index 2b259cfa..9382faa0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt
@@ -27,7 +27,7 @@ import code.name.monkey.retromusic.Constants
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.activities.MainActivity
+import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.util.RetroUtil
 
 class AppWidgetText : BaseAppWidget() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
index db03ddc4..578012c1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
@@ -25,7 +25,7 @@ import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.loaders.PlaylistLoader
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.adapter.playlist.AddToPlaylist
+import code.name.monkey.retromusic.adapter.playlist.AddToPlaylist
 import code.name.monkey.retromusic.views.RoundedBottomSheetDialogFragment
 import kotlinx.android.synthetic.main.dialog_add_to_playlist.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
index 6fc1f8f7..0d66413a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
@@ -26,9 +26,9 @@ import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.Constants.USER_PROFILE
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.ui.activities.MainActivity
-import code.name.monkey.retromusic.ui.activities.bugreport.BugReportActivity
-import code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment
+import code.name.monkey.retromusic.activities.MainActivity
+import code.name.monkey.retromusic.activities.bugreport.BugReportActivity
+import code.name.monkey.retromusic.fragments.mainactivity.folders.FoldersFragment
 import code.name.monkey.retromusic.util.Compressor
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt
similarity index 85%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt
index 48817d98..48764425 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments
+package code.name.monkey.retromusic.fragments
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
@@ -11,7 +11,7 @@ enum class AlbumCoverStyle(@param:StringRes @field:StringRes
                            val drawableResId: Int, val id: Int) {
     NORMAL(R.string.normal, R.drawable.np_normal, 0),
     FLAT(R.string.flat, R.drawable.np_flat, 1),
-    CIRCLE(R.string.circular, R.drawable.album_cover_circle, 2),
+    CIRCLE(R.string.circular, R.drawable.np_circle, 2),
     MATERIAL(R.string.material, R.drawable.np_material, 3),
     CARD(R.string.card, R.drawable.np_blur_card, 4),
     FULL(R.string.full, R.drawable.np_full, 5),
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt
index 19e671b1..e7ace8b6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments
+package code.name.monkey.retromusic.fragments
 
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
@@ -14,7 +14,7 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.ui.fragments.base.AbsMusicServiceFragment
+import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/NowPlayingScreen.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/NowPlayingScreen.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
index f26b1156..e3a61c7e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/NowPlayingScreen.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments
+package code.name.monkey.retromusic.fragments
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/VolumeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/VolumeFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt
index ff9b4ba5..d5d46d2e 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/VolumeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments
+package code.name.monkey.retromusic.fragments
 
 import android.content.Context
 import android.graphics.Color
@@ -12,7 +12,6 @@ import android.widget.SeekBar
 import androidx.fragment.app.Fragment
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.util.PreferenceUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerFragment.kt
similarity index 72%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerFragment.kt
index f7949319..c1ceaefc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerFragment.kt
@@ -1,7 +1,7 @@
-package code.name.monkey.retromusic.ui.fragments.base
+package code.name.monkey.retromusic.fragments.base
 
 import android.os.Bundle
-import code.name.monkey.retromusic.ui.fragments.mainactivity.LibraryFragment
+import code.name.monkey.retromusic.fragments.mainactivity.LibraryFragment
 
 open class AbsLibraryPagerFragment : AbsMusicServiceFragment() {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt
index 35343204..ec0feb9e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.base
+package code.name.monkey.retromusic.fragments.base
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
index ee93dd03..7246dfee 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.base
+package code.name.monkey.retromusic.fragments.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt
index cb4babc4..168f418f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.base
+package code.name.monkey.retromusic.fragments.base
 
 import android.os.Build
 import android.os.Bundle
@@ -9,7 +9,7 @@ import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.dialogs.OptionsSheetDialogFragment
-import code.name.monkey.retromusic.ui.activities.MainActivity
+import code.name.monkey.retromusic.activities.MainActivity
 
 abstract class AbsMainActivityFragment : AbsMusicServiceFragment() {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMusicServiceFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMusicServiceFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt
index 6487572b..f916b08d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMusicServiceFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt
@@ -1,11 +1,11 @@
-package code.name.monkey.retromusic.ui.fragments.base
+package code.name.monkey.retromusic.fragments.base
 
 import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import code.name.monkey.retromusic.interfaces.MusicServiceEventListener
-import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 
 /**
  * Created by hemanths on 18/08/17.
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
index fea5c543..98d7f481 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.base
+package code.name.monkey.retromusic.fragments.base
 
 import android.os.Bundle
 import android.view.View
@@ -6,7 +6,7 @@ import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.ui.fragments.VolumeFragment
+import code.name.monkey.retromusic.fragments.VolumeFragment
 import code.name.monkey.retromusic.util.PreferenceUtil
 
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
index e338a317..412d2475 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.base
+package code.name.monkey.retromusic.fragments.base
 
 import android.annotation.SuppressLint
 import android.content.ContentUris
@@ -20,9 +20,9 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.PaletteColorHolder
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.model.lyrics.Lyrics
-import code.name.monkey.retromusic.ui.activities.tageditor.AbsTagEditorActivity
-import code.name.monkey.retromusic.ui.activities.tageditor.SongTagEditorActivity
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
+import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.util.*
 import code.name.monkey.retromusic.views.FitSystemWindowsLayout
 import java.io.FileNotFoundException
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt
index a202d1e9..e8bb33ff 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.mainactivity
+package code.name.monkey.retromusic.fragments.mainactivity
 
 import android.os.Bundle
 import androidx.recyclerview.widget.GridLayoutManager
@@ -6,8 +6,8 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.mvp.contract.AlbumContract
 import code.name.monkey.retromusic.mvp.presenter.AlbumPresenter
-import code.name.monkey.retromusic.ui.adapter.album.AlbumAdapter
-import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment
+import code.name.monkey.retromusic.adapter.album.AlbumAdapter
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment
 import code.name.monkey.retromusic.util.PreferenceUtil
 
 open class AlbumsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridLayoutManager>(), AlbumContract.AlbumView {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/ArtistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/ArtistsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
index bddb8bce..0d16dbce 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/ArtistsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.mainactivity
+package code.name.monkey.retromusic.fragments.mainactivity
 
 import android.os.Bundle
 import androidx.recyclerview.widget.GridLayoutManager
@@ -6,8 +6,8 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.mvp.contract.ArtistContract
 import code.name.monkey.retromusic.mvp.presenter.ArtistPresenter
-import code.name.monkey.retromusic.ui.adapter.artist.ArtistAdapter
-import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment
+import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment
 import code.name.monkey.retromusic.util.PreferenceUtil
 import java.util.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/GenreFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenreFragment.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/GenreFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenreFragment.kt
index a31c151a..eb5989bd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/GenreFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenreFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.mainactivity
+package code.name.monkey.retromusic.fragments.mainactivity
 
 import android.os.Bundle
 import android.view.Menu
@@ -8,8 +8,8 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.model.Genre
 import code.name.monkey.retromusic.mvp.contract.GenreContract
 import code.name.monkey.retromusic.mvp.presenter.GenrePresenter
-import code.name.monkey.retromusic.ui.adapter.GenreAdapter
-import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewFragment
+import code.name.monkey.retromusic.adapter.GenreAdapter
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewFragment
 import code.name.monkey.retromusic.util.PreferenceUtil
 import java.util.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java
rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java
index 7c474b22..22446b9d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.mainactivity;
+package code.name.monkey.retromusic.fragments.mainactivity;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
@@ -40,8 +40,8 @@ import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog;
 import code.name.monkey.retromusic.helper.SortOrder;
 import code.name.monkey.retromusic.interfaces.CabHolder;
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks;
-import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
-import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment;
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
+import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment;
 import code.name.monkey.retromusic.util.Compressor;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 import code.name.monkey.retromusic.util.RetroColorUtil;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/PlaylistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/PlaylistsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt
index 8871a690..8bbd0e8f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/PlaylistsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.mainactivity
+package code.name.monkey.retromusic.fragments.mainactivity
 
 import android.os.Bundle
 import android.view.Menu
@@ -8,8 +8,8 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.mvp.contract.PlaylistContract
 import code.name.monkey.retromusic.mvp.presenter.PlaylistPresenter
-import code.name.monkey.retromusic.ui.adapter.playlist.PlaylistAdapter
-import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewFragment
+import code.name.monkey.retromusic.adapter.playlist.PlaylistAdapter
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewFragment
 import code.name.monkey.retromusic.util.PreferenceUtil
 import java.util.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/SongsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/SongsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
index e444bf35..6fe1aae2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/SongsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.mainactivity
+package code.name.monkey.retromusic.fragments.mainactivity
 
 import android.os.Bundle
 import androidx.recyclerview.widget.GridLayoutManager
@@ -7,9 +7,9 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.mvp.contract.SongContract
 import code.name.monkey.retromusic.mvp.presenter.SongPresenter
-import code.name.monkey.retromusic.ui.adapter.song.ShuffleButtonSongAdapter
-import code.name.monkey.retromusic.ui.adapter.song.SongAdapter
-import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment
+import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
+import code.name.monkey.retromusic.adapter.song.SongAdapter
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment
 import code.name.monkey.retromusic.util.PreferenceUtil
 import java.util.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java
rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
index 429fa510..b2ec3874 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.mainactivity.folders;
+package code.name.monkey.retromusic.fragments.mainactivity.folders;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -60,8 +60,8 @@ import code.name.monkey.retromusic.misc.DialogAsyncTask;
 import code.name.monkey.retromusic.misc.UpdateToastMediaScannerCompletionListener;
 import code.name.monkey.retromusic.misc.WrappedAsyncTaskLoader;
 import code.name.monkey.retromusic.model.Song;
-import code.name.monkey.retromusic.ui.adapter.SongFileAdapter;
-import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment;
+import code.name.monkey.retromusic.adapter.SongFileAdapter;
+import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment;
 import code.name.monkey.retromusic.util.FileUtil;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 import code.name.monkey.retromusic.util.RetroColorUtil;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt
index 73be8a92..17e0a6ec 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.mainactivity.home
+package code.name.monkey.retromusic.fragments.mainactivity.home
 
 import android.graphics.Bitmap
 import android.graphics.Color
@@ -26,8 +26,8 @@ import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
 import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist
 import code.name.monkey.retromusic.mvp.contract.HomeContract
 import code.name.monkey.retromusic.mvp.presenter.HomePresenter
-import code.name.monkey.retromusic.ui.adapter.HomeAdapter
-import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment
+import code.name.monkey.retromusic.adapter.HomeAdapter
+import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
 import code.name.monkey.retromusic.util.Compressor
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
index 73b16d5d..7148817b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
@@ -1,21 +1,16 @@
-package code.name.monkey.retromusic.ui.fragments.player
+package code.name.monkey.retromusic.fragments.player
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.TextView
 import androidx.viewpager.widget.ViewPager
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics
-import code.name.monkey.retromusic.model.lyrics.Lyrics
 import code.name.monkey.retromusic.transform.CarousalPagerTransformer
 import code.name.monkey.retromusic.transform.ParallaxPagerTransformer
-import code.name.monkey.retromusic.ui.adapter.album.AlbumCoverPagerAdapter
-import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen
-import code.name.monkey.retromusic.ui.fragments.base.AbsMusicServiceFragment
+import code.name.monkey.retromusic.adapter.album.AlbumCoverPagerAdapter
+import code.name.monkey.retromusic.fragments.NowPlayingScreen
+import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
 import code.name.monkey.retromusic.util.PreferenceUtil
 import kotlinx.android.synthetic.main.fragment_player_album_cover.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptiveFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptiveFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt
index 4cb62cee..a7fe6d3e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptiveFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.adaptive
+package code.name.monkey.retromusic.fragments.player.adaptive
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -11,8 +11,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import kotlinx.android.synthetic.main.fragment_adaptive_player.*
 
 class AdaptiveFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbacks {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
index 16295e13..1998c6e4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.adaptive
+package code.name.monkey.retromusic.fragments.player.adaptive
 
 import android.animation.ObjectAnimator
 import android.graphics.PorterDuff
@@ -19,7 +19,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt
index 5d4aa9f5..be8907a7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.blur
+package code.name.monkey.retromusic.fragments.player.blur
 
 import android.animation.ObjectAnimator
 import android.graphics.Color
@@ -21,8 +21,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.VolumeFragment
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import kotlinx.android.synthetic.main.fragment_player_playback_controls.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlayerFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
index 9c5fab97..217d0a97 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.blur
+package code.name.monkey.retromusic.fragments.player.blur
 
 import android.graphics.Color
 import android.graphics.drawable.Drawable
@@ -16,8 +16,8 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import kotlinx.android.synthetic.main.fragment_blur.*
 
 class BlurPlayerFragment : AbsPlayerFragment() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt
index fe1268b1..b3f920e0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.card
+package code.name.monkey.retromusic.fragments.player.card
 
 import android.graphics.Color
 import android.os.Bundle
@@ -10,9 +10,9 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
 import kotlinx.android.synthetic.main.fragment_card_player.*
 
 class CardFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbacks {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardPlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt
index 8cbc1830..e75ed286 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.card
+package code.name.monkey.retromusic.fragments.player.card
 
 import android.animation.ObjectAnimator
 import android.graphics.PorterDuff
@@ -19,8 +19,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.VolumeFragment
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import kotlinx.android.synthetic.main.fragment_card_player_playback_controls.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
index bfa821e4..492dfe69 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.cardblur
+package code.name.monkey.retromusic.fragments.player.cardblur
 
 import android.graphics.Color
 import android.graphics.drawable.Drawable
@@ -16,9 +16,9 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
 import kotlinx.android.synthetic.main.fragment_card_blur_player.*
 
 class CardBlurFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbacks {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
index 6775d43b..e6e441e4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.cardblur
+package code.name.monkey.retromusic.fragments.player.cardblur
 
 import android.animation.ObjectAnimator
 import android.graphics.Color
@@ -19,8 +19,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.VolumeFragment
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import kotlinx.android.synthetic.main.fragment_card_blur_player_playback_controls.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/classic/ClassicPlayerFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
index 6e6d1bf0..1776a224 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/classic/ClassicPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.classic
+package code.name.monkey.retromusic.fragments.player.classic
 
 import android.animation.Animator
 import android.animation.AnimatorSet
@@ -21,11 +21,11 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.menu.SongMenuHelper
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.model.lyrics.Lyrics
-import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.ui.adapter.song.PlayingQueueAdapter
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.RetroUtil
 import code.name.monkey.retromusic.util.ViewUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt
index fa65b39e..bddaa282 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.classic
+package code.name.monkey.retromusic.fragments.player.classic
 
 import android.animation.ObjectAnimator
 import android.graphics.Color
@@ -14,14 +14,12 @@ import androidx.annotation.NonNull
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.VolumeFragment
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.views.PlayPauseDrawable
 import kotlinx.android.synthetic.main.fragment_classic_player_playback_controls.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
index 511f82e0..3529b55c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.color
+package code.name.monkey.retromusic.fragments.player.color
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
@@ -26,8 +26,8 @@ import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.model.lyrics.Lyrics
-import code.name.monkey.retromusic.ui.activities.LyricsActivity
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.activities.LyricsActivity
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.ViewUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorPlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt
index f31c45c8..013ae905 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.color
+package code.name.monkey.retromusic.fragments.player.color
 
 import android.animation.ObjectAnimator
 import android.content.res.ColorStateList
@@ -20,7 +20,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import kotlinx.android.synthetic.main.fragment_player_playback_controls.*
 import kotlinx.android.synthetic.main.media_button.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/fit/FitFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/fit/FitFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
index 3329eadd..f7dac974 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/fit/FitFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.fit
+package code.name.monkey.retromusic.fragments.player.fit
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,8 +10,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import kotlinx.android.synthetic.main.fragment_fit.*
 
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/fit/FitPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/fit/FitPlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt
index 2d65f6bf..9abbd3ec 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/fit/FitPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.fit
+package code.name.monkey.retromusic.fragments.player.fit
 
 import android.animation.ObjectAnimator
 import android.graphics.PorterDuff
@@ -21,8 +21,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.VolumeFragment
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import kotlinx.android.synthetic.main.fragment_player_playback_controls.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt
index e6756fca..7fbcdc57 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.flat
+package code.name.monkey.retromusic.fragments.player.flat
 
 import android.animation.ObjectAnimator
 import android.graphics.PorterDuff
@@ -21,8 +21,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper.Callback
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.VolumeFragment
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlayerFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
index 2690dd33..1a83b67b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.flat
+package code.name.monkey.retromusic.fragments.player.flat
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
@@ -15,8 +15,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import code.name.monkey.retromusic.views.DrawableGradient
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
index 2a504cff..ca2a19ba 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.full
+package code.name.monkey.retromusic.fragments.player.full
 
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
@@ -27,7 +27,7 @@ import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt
index 48d071b9..fa5c1132 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.full
+package code.name.monkey.retromusic.fragments.player.full
 
 import android.graphics.Color
 import android.os.Bundle
@@ -21,8 +21,8 @@ import code.name.monkey.retromusic.loaders.ArtistLoader
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics
 import code.name.monkey.retromusic.model.lyrics.Lyrics
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.util.NavigationUtil
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt
index 89089a2d..9c03ab6f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.lockscreen
+package code.name.monkey.retromusic.fragments.player.lockscreen
 
 import android.animation.ObjectAnimator
 import android.graphics.PorterDuff
@@ -20,7 +20,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt
index 043977d5..e40c82e6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.material
+package code.name.monkey.retromusic.fragments.player.material
 
 import android.animation.ObjectAnimator
 import android.graphics.PorterDuff
@@ -18,8 +18,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.VolumeFragment
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt
index 14888840..d32b0e2f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.material
+package code.name.monkey.retromusic.fragments.player.material
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,9 +10,9 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
 import kotlinx.android.synthetic.main.fragment_material.*
 
 /**
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
index c01186de..dfea11f7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
@@ -1,11 +1,10 @@
-package code.name.monkey.retromusic.ui.fragments.player.normal
+package code.name.monkey.retromusic.fragments.player.normal
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -15,10 +14,9 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import code.name.monkey.retromusic.views.DrawableGradient
 import kotlinx.android.synthetic.main.fragment_player.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerPlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
index e2af0266..9dd78cef 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.normal
+package code.name.monkey.retromusic.fragments.player.normal
 
 import android.animation.ObjectAnimator
 import android.graphics.PorterDuff
@@ -20,7 +20,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt
index 7135ce0f..4a71afb7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.plain
+package code.name.monkey.retromusic.fragments.player.plain
 
 import android.animation.ObjectAnimator
 import android.content.res.ColorStateList
@@ -22,8 +22,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.VolumeFragment
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlayerFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt
index 0fd60579..f1e064b5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.plain
+package code.name.monkey.retromusic.fragments.player.plain
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,8 +10,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import kotlinx.android.synthetic.main.fragment_plain_player.*
 
 class PlainPlayerFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbacks {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt
index a4b9ed8d..a6f8017b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.simple
+package code.name.monkey.retromusic.fragments.player.simple
 
 import android.graphics.PorterDuff
 import android.os.Bundle
@@ -16,7 +16,7 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import kotlinx.android.synthetic.main.fragment_simple_controls_fragment.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlayerFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt
index ec8f80b2..5e78135b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.simple
+package code.name.monkey.retromusic.fragments.player.simple
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,8 +10,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import kotlinx.android.synthetic.main.fragment_simple_player.*
 
 /**
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/slide/SlidePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/slide/SlidePlayerFragment.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/slide/SlidePlayerFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/slide/SlidePlayerFragment.kt
index 947e4bef..afe71387 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/slide/SlidePlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/slide/SlidePlayerFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.ui.fragments.player.slide
+package code.name.monkey.retromusic.fragments.player.slide
 
 import android.animation.ObjectAnimator
 import android.graphics.Color
@@ -40,11 +40,10 @@ import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.ui.adapter.song.SimpleSongAdapter
-import code.name.monkey.retromusic.ui.fragments.VolumeFragment
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
+import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/tiny/TinyPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/tiny/TinyPlaybackControlsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt
index d87a0974..09043a6e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/tiny/TinyPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.tiny
+package code.name.monkey.retromusic.fragments.player.tiny
 
 import android.graphics.PorterDuff
 import android.os.Bundle
@@ -10,7 +10,7 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import kotlinx.android.synthetic.main.fragment_tiny_controls_fragment.*
 
 class TinyPlaybackControlsFragment : AbsPlayerControlsFragment() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/tiny/TinyPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/tiny/TinyPlayerFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
index a1b3ec83..51ec79ee 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/tiny/TinyPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.player.tiny
+package code.name.monkey.retromusic.fragments.player.tiny
 
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
@@ -18,9 +18,9 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.fragments.MiniPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.MiniPlayerFragment
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import kotlinx.android.synthetic.main.fragment_tiny_player.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
index a30b276a..cb6ad7db 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.settings
+package code.name.monkey.retromusic.fragments.settings
 
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AudioSettings.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AudioSettings.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt
index 8ecb9df6..63220236 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AudioSettings.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.settings
+package code.name.monkey.retromusic.fragments.settings
 
 import android.content.Intent
 import android.media.audiofx.AudioEffect
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ImageSettingFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ImageSettingFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt
index b7ac3a8c..1f09c211 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ImageSettingFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.settings
+package code.name.monkey.retromusic.fragments.settings
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
index 12d2709e..1627286c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.settings
+package code.name.monkey.retromusic.fragments.settings
 
 import android.graphics.Bitmap
 import android.os.Bundle
@@ -11,7 +11,7 @@ import androidx.fragment.app.Fragment
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.Constants.USER_PROFILE
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.ui.activities.SettingsActivity
+import code.name.monkey.retromusic.activities.SettingsActivity
 import code.name.monkey.retromusic.util.Compressor
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NotificationSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NotificationSettingsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt
index fc3dfe4c..ba1cb40d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NotificationSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.settings
+package code.name.monkey.retromusic.fragments.settings
 
 import android.os.Build
 import android.os.Bundle
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NowPlayingSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NowPlayingSettingsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt
index 4888bcad..5563f10d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NowPlayingSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.settings
+package code.name.monkey.retromusic.fragments.settings
 
 import android.content.SharedPreferences
 import android.os.Bundle
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/OtherSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/OtherSettingsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
index d76e9bc3..f2c67726 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/OtherSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.settings
+package code.name.monkey.retromusic.fragments.settings
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/PersonaizeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonaizeSettingsFragment.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/PersonaizeSettingsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonaizeSettingsFragment.kt
index b3ed43f7..d2d0424e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/PersonaizeSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonaizeSettingsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.settings
+package code.name.monkey.retromusic.fragments.settings
 
 import android.content.SharedPreferences
 import android.os.Bundle
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ThemeSettingsFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
index ff5fae17..17a9f882 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ThemeSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.ui.fragments.settings
+package code.name.monkey.retromusic.fragments.settings
 
 import android.graphics.Color
 import android.graphics.Color.BLUE
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/LastChanceHandler.kt b/app/src/main/java/code/name/monkey/retromusic/helper/LastChanceHandler.kt
index 53e0fedb..c9439c94 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/LastChanceHandler.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/LastChanceHandler.kt
@@ -17,7 +17,7 @@ package code.name.monkey.retromusic.helper
 import android.content.Intent
 import androidx.core.app.ActivityCompat
 import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.ui.activities.bugreport.ErrorHandlerActivity
+import code.name.monkey.retromusic.activities.bugreport.ErrorHandlerActivity
 
 class TopExceptionHandler() : Thread.UncaughtExceptionHandler {
     private val defaultUEH: Thread.UncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler()
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt
index 0b33051b..397f7f3f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt
@@ -28,8 +28,8 @@ import code.name.monkey.retromusic.dialogs.SongDetailDialog
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.PaletteColorHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.ui.activities.tageditor.AbsTagEditorActivity
-import code.name.monkey.retromusic.ui.activities.tageditor.SongTagEditorActivity
+import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
+import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.RingtoneManager
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Home.kt b/app/src/main/java/code/name/monkey/retromusic/model/Home.kt
index 3fb151c4..28c2933c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Home.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Home.kt
@@ -16,7 +16,7 @@ package code.name.monkey.retromusic.model
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.HomeSection
+import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.HomeSection
 
 /**
  * Created by hemanths on 3/4/19
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt
index 879aa1d2..ddc0665e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt
@@ -18,7 +18,7 @@ import android.os.Bundle
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.mvp.Presenter
 import code.name.monkey.retromusic.mvp.contract.ArtistDetailContract
-import code.name.monkey.retromusic.ui.activities.ArtistDetailActivity
+import code.name.monkey.retromusic.activities.ArtistDetailActivity
 
 
 /**
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt
index b9544708..31d13291 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt
@@ -18,12 +18,12 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.model.Home
 import code.name.monkey.retromusic.mvp.Presenter
 import code.name.monkey.retromusic.mvp.contract.HomeContract
-import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.GENRES
-import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.PLAYLISTS
-import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.RECENT_ALBUMS
-import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.RECENT_ARTISTS
-import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.TOP_ALBUMS
-import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.TOP_ARTISTS
+import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.GENRES
+import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.PLAYLISTS
+import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.RECENT_ALBUMS
+import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.RECENT_ARTISTS
+import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.TOP_ALBUMS
+import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.TOP_ARTISTS
 import code.name.monkey.retromusic.util.PreferenceUtil
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
index a4ccb4af..ed789d59 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
@@ -29,7 +29,7 @@ import androidx.preference.PreferenceDialogFragmentCompat
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.ui.fragments.AlbumCoverStyle
+import code.name.monkey.retromusic.fragments.AlbumCoverStyle
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import com.afollestad.materialdialogs.MaterialDialog
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
index 3220db81..50f8eb9e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
@@ -30,7 +30,7 @@ import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen
+import code.name.monkey.retromusic.fragments.NowPlayingScreen
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt
index 4f9057bd..7d1e08a0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt
@@ -39,7 +39,7 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroSimpleTarget
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.activities.MainActivity
+import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.RetroUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt
index a556d657..137d314a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt
@@ -34,7 +34,7 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroSimpleTarget
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.activities.MainActivity
+import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroColorUtil
 import com.bumptech.glide.request.target.Target
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt
index 8455676a..5d722e16 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt
@@ -36,7 +36,7 @@ import code.name.monkey.retromusic.glide.RetroSimpleTarget
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.ui.activities.MainActivity
+import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroUtil
 import code.name.monkey.retromusic.util.RetroUtil.createBitmap
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/ErrorHandlerActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/ErrorHandlerActivity.kt
deleted file mode 100644
index a568d91b..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/ErrorHandlerActivity.kt
+++ /dev/null
@@ -1 +0,0 @@
-package code.name.monkey.retromusic.ui.activities.bugreport

import android.content.ActivityNotFoundException
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.ui.activities.bugreport.model.DeviceInfo
import kotlinx.android.synthetic.main.activity_error_handler.*


class ErrorHandlerActivity : AppCompatActivity() {
    private var deviceInfo: DeviceInfo? = null
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_error_handler)

        deviceInfo = DeviceInfo(this)

        clearAppData.setOnClickListener {
            try {
                val intent = Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
                intent.data = Uri.parse("package:$packageName")
                startActivity(intent)
            } catch (e: ActivityNotFoundException) {
                val intent = Intent(android.provider.Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS)
                startActivity(intent)
            }
        }

        sendCrashLog.setOnClickListener {
            val sendIntent = Intent(Intent.ACTION_SEND)
            val subject = "Error report"
            val body = intent.getStringExtra("error") + "\n" + deviceInfo!!.toString()

            sendIntent.putExtra(Intent.EXTRA_EMAIL, arrayOf("monkeycodeapp@gmail.com"))
            sendIntent.putExtra(Intent.EXTRA_TEXT, body)
            sendIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
            sendIntent.type = "message/rfc822"

            startActivity(Intent.createChooser(sendIntent, "Send crash log"))
            deleteFile("stack.trace")
        }

        showCrashError.text = String.format("%s", intent.getStringExtra("error"))
        showCrashError.append(deviceInfo!!.toString())
    }
}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
index 07631c1f..2c39e534 100755
--- a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
@@ -30,21 +30,21 @@ import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.helper.MusicPlayerRemote;
 import code.name.monkey.retromusic.model.Genre;
 import code.name.monkey.retromusic.model.Playlist;
-import code.name.monkey.retromusic.ui.activities.AboutActivity;
-import code.name.monkey.retromusic.ui.activities.AlbumDetailsActivity;
-import code.name.monkey.retromusic.ui.activities.ArtistDetailActivity;
-import code.name.monkey.retromusic.ui.activities.EqualizerActivity;
-import code.name.monkey.retromusic.ui.activities.GenreDetailsActivity;
-import code.name.monkey.retromusic.ui.activities.LicenseActivity;
-import code.name.monkey.retromusic.ui.activities.LyricsActivity;
-import code.name.monkey.retromusic.ui.activities.PlayingQueueActivity;
-import code.name.monkey.retromusic.ui.activities.PlaylistDetailActivity;
-import code.name.monkey.retromusic.ui.activities.PurchaseActivity;
-import code.name.monkey.retromusic.ui.activities.SearchActivity;
-import code.name.monkey.retromusic.ui.activities.SettingsActivity;
-import code.name.monkey.retromusic.ui.activities.SupportDevelopmentActivity;
-import code.name.monkey.retromusic.ui.activities.UserInfoActivity;
-import code.name.monkey.retromusic.ui.activities.WhatsNewActivity;
+import code.name.monkey.retromusic.activities.AboutActivity;
+import code.name.monkey.retromusic.activities.AlbumDetailsActivity;
+import code.name.monkey.retromusic.activities.ArtistDetailActivity;
+import code.name.monkey.retromusic.activities.EqualizerActivity;
+import code.name.monkey.retromusic.activities.GenreDetailsActivity;
+import code.name.monkey.retromusic.activities.LicenseActivity;
+import code.name.monkey.retromusic.activities.LyricsActivity;
+import code.name.monkey.retromusic.activities.PlayingQueueActivity;
+import code.name.monkey.retromusic.activities.PlaylistDetailActivity;
+import code.name.monkey.retromusic.activities.PurchaseActivity;
+import code.name.monkey.retromusic.activities.SearchActivity;
+import code.name.monkey.retromusic.activities.SettingsActivity;
+import code.name.monkey.retromusic.activities.SupportDevelopmentActivity;
+import code.name.monkey.retromusic.activities.UserInfoActivity;
+import code.name.monkey.retromusic.activities.WhatsNewActivity;
 
 import static code.name.monkey.retromusic.Constants.RATE_ON_GOOGLE_PLAY;
 import static code.name.monkey.retromusic.util.RetroUtil.openUrl;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
index d00ebb04..b5fb2368 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
@@ -41,10 +41,10 @@ import code.name.monkey.retromusic.transform.HorizontalFlipTransformation;
 import code.name.monkey.retromusic.transform.NormalPageTransformer;
 import code.name.monkey.retromusic.transform.VerticalFlipTransformation;
 import code.name.monkey.retromusic.transform.VerticalStackTransformer;
-import code.name.monkey.retromusic.ui.activities.MainActivity;
-import code.name.monkey.retromusic.ui.fragments.AlbumCoverStyle;
-import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen;
-import code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment;
+import code.name.monkey.retromusic.activities.MainActivity;
+import code.name.monkey.retromusic.fragments.AlbumCoverStyle;
+import code.name.monkey.retromusic.fragments.NowPlayingScreen;
+import code.name.monkey.retromusic.fragments.mainactivity.folders.FoldersFragment;
 
 public final class PreferenceUtil {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt
index 71ba984e..39f233f2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt
@@ -24,7 +24,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.util.RetroUtil
 
 class MetalRecyclerViewPager : RecyclerView {
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java b/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java
index 45a9d560..bca21dd8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java
@@ -37,8 +37,7 @@ import androidx.appcompat.app.AppCompatDialogFragment;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.VersionUtils;
 import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity;
-import code.name.monkey.retromusic.util.PreferenceUtil;
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity;
 import code.name.monkey.retromusic.util.RetroUtil;
 
 /**
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_circle.webp b/app/src/main/res/drawable-xxxhdpi/np_circle.webp
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/album_cover_circle.webp
rename to app/src/main/res/drawable-xxxhdpi/np_circle.webp
diff --git a/app/src/main/res/drawable/promotional.webp b/app/src/main/res/drawable/promotional.webp
deleted file mode 100644
index 321f68d9..00000000
Binary files a/app/src/main/res/drawable/promotional.webp and /dev/null differ
diff --git a/app/src/main/res/layout-land/fragment_blur.xml b/app/src/main/res/layout-land/fragment_blur.xml
index 6af2540c..3dea59ce 100644
--- a/app/src/main/res/layout-land/fragment_blur.xml
+++ b/app/src/main/res/layout-land/fragment_blur.xml
@@ -56,7 +56,7 @@
 
                     <fragment
                         android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         tools:layout="@layout/fragment_player_album_cover" />
@@ -69,7 +69,7 @@
 
                     <fragment
                         android:id="@+id/playbackControlsFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_weight="1" />
diff --git a/app/src/main/res/layout-land/fragment_card_blur_player.xml b/app/src/main/res/layout-land/fragment_card_blur_player.xml
index f8ae76af..510c503f 100644
--- a/app/src/main/res/layout-land/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml
@@ -67,7 +67,7 @@
 
                 <fragment
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </FrameLayout>
@@ -83,7 +83,7 @@
 
             <fragment
                 android:id="@+id/playbackControlsFragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 tools:layout="@layout/fragment_card_blur_player_playback_controls" />
diff --git a/app/src/main/res/layout-land/fragment_card_player.xml b/app/src/main/res/layout-land/fragment_card_player.xml
index ed605062..d13b7c9e 100644
--- a/app/src/main/res/layout-land/fragment_card_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_player.xml
@@ -10,7 +10,7 @@
 
     <fragment
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:layout="@layout/fragment_album_cover" />
@@ -67,7 +67,7 @@
 
                     <fragment
                         android:id="@+id/playbackControlsFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.card.CardPlaybackControlsFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         tools:layout="@layout/fragment_card_player_playback_controls" />
diff --git a/app/src/main/res/layout-land/fragment_classic_player.xml b/app/src/main/res/layout-land/fragment_classic_player.xml
index 0a9e122d..bc90d71c 100644
--- a/app/src/main/res/layout-land/fragment_classic_player.xml
+++ b/app/src/main/res/layout-land/fragment_classic_player.xml
@@ -31,7 +31,7 @@
 
                 <fragment
                     android:id="@+id/playerAlbumCoverFragment"
-                    class="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                    class="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
             </code.name.monkey.retromusic.views.HeightFitSquareLayout>
@@ -62,7 +62,7 @@
 
                     <fragment
                         android:id="@+id/playbackControlsFragment"
-                        class="code.name.monkey.retromusic.ui.fragments.player.classic.ClassicPlayerPlaybackControlsFragment"
+                        class="code.name.monkey.retromusic.fragments.player.classic.ClassicPlayerPlaybackControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout-land/fragment_color_player.xml b/app/src/main/res/layout-land/fragment_color_player.xml
index c0b9926b..5d653dc3 100644
--- a/app/src/main/res/layout-land/fragment_color_player.xml
+++ b/app/src/main/res/layout-land/fragment_color_player.xml
@@ -105,7 +105,7 @@
 
                         <fragment
                             android:id="@+id/playbackControlsFragment"
-                            android:name="code.name.monkey.retromusic.ui.fragments.player.color.ColorPlaybackControlsFragment"
+                            android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             tools:layout="@layout/fragment_player_playback_controls" />
diff --git a/app/src/main/res/layout-land/fragment_flat_player.xml b/app/src/main/res/layout-land/fragment_flat_player.xml
index b9baaa40..0f7d0a88 100644
--- a/app/src/main/res/layout-land/fragment_flat_player.xml
+++ b/app/src/main/res/layout-land/fragment_flat_player.xml
@@ -43,7 +43,7 @@
 
                     <fragment
                         android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         tools:layout="@layout/fragment_player_album_cover" />
@@ -69,7 +69,7 @@
 
                     <fragment
                         android:id="@+id/playbackControlsFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.flat.FlatPlaybackControlsFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout-land/fragment_material.xml b/app/src/main/res/layout-land/fragment_material.xml
index 17a95c25..5403abf6 100644
--- a/app/src/main/res/layout-land/fragment_material.xml
+++ b/app/src/main/res/layout-land/fragment_material.xml
@@ -37,7 +37,7 @@
 
                     <fragment
                         android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         tools:layout="@layout/fragment_album_cover" />
@@ -55,7 +55,7 @@
 
                         <fragment
                             android:id="@+id/playbackControlsFragment"
-                            android:name="code.name.monkey.retromusic.ui.fragments.player.material.MaterialControlsFragment"
+                            android:name="code.name.monkey.retromusic.fragments.player.material.MaterialControlsFragment"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             tools:layout="@layout/fragment_material_playback_controls" />
diff --git a/app/src/main/res/layout-land/fragment_plain_player.xml b/app/src/main/res/layout-land/fragment_plain_player.xml
index f51d0c48..de85301e 100644
--- a/app/src/main/res/layout-land/fragment_plain_player.xml
+++ b/app/src/main/res/layout-land/fragment_plain_player.xml
@@ -38,7 +38,7 @@
 
                     <fragment
                         android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         tools:layout="@layout/fragment_player_album_cover" />
@@ -91,7 +91,7 @@
 
                         <fragment
                             android:id="@+id/playbackControlsFragment"
-                            android:name="code.name.monkey.retromusic.ui.fragments.player.plain.PlainPlaybackControlsFragment"
+                            android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             tools:layout="@layout/fragment_plain_controls_fragment" />
diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml
index 4d818d33..ee835e88 100755
--- a/app/src/main/res/layout-land/fragment_player.xml
+++ b/app/src/main/res/layout-land/fragment_player.xml
@@ -47,7 +47,7 @@
 
                     <fragment
                         android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         tools:layout="@layout/fragment_player_album_cover" />
@@ -73,7 +73,7 @@
 
                     <fragment
                         android:id="@+id/playbackControlsFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.normal.PlayerPlaybackControlsFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout-land/fragment_simple_player.xml b/app/src/main/res/layout-land/fragment_simple_player.xml
index a8832e1d..cdb29835 100644
--- a/app/src/main/res/layout-land/fragment_simple_player.xml
+++ b/app/src/main/res/layout-land/fragment_simple_player.xml
@@ -44,7 +44,7 @@
 
                     <fragment
                         android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         tools:layout="@layout/fragment_player_album_cover" />
@@ -59,7 +59,7 @@
 
                     <fragment
                         android:id="@+id/playbackControlsFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.simple.SimplePlaybackControlsFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
diff --git a/app/src/main/res/layout-land/fragment_slide_player.xml b/app/src/main/res/layout-land/fragment_slide_player.xml
index 16ab42d4..bcf5c47f 100644
--- a/app/src/main/res/layout-land/fragment_slide_player.xml
+++ b/app/src/main/res/layout-land/fragment_slide_player.xml
@@ -310,7 +310,7 @@
 
                 <fragment
                     android:id="@+id/volumeFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.VolumeFragment"
+                    android:name="code.name.monkey.retromusic.fragments.VolumeFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout-xlarge-land/fragment_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
index adae5a1f..8883e93a 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
@@ -49,7 +49,7 @@
 
             <fragment
                 android:id="@+id/playerAlbumCoverFragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
@@ -62,7 +62,7 @@
 
             <fragment
                 android:id="@+id/playbackControlsFragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
         </FrameLayout>
diff --git a/app/src/main/res/layout-xlarge-land/fragment_player.xml b/app/src/main/res/layout-xlarge-land/fragment_player.xml
index 5c1ce354..6fdce2d4 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_player.xml
@@ -43,7 +43,7 @@
 
                     <fragment
                         android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         tools:layout="@layout/fragment_player_album_cover" />
@@ -51,7 +51,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.normal.PlayerPlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_player_playback_controls" />
diff --git a/app/src/main/res/layout-xlarge/fragment_blur.xml b/app/src/main/res/layout-xlarge/fragment_blur.xml
index fe2da4ac..83fed952 100644
--- a/app/src/main/res/layout-xlarge/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge/fragment_blur.xml
@@ -52,7 +52,7 @@
 
                 <fragment
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
@@ -65,7 +65,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_blur_playback_controls" />
diff --git a/app/src/main/res/layout-xlarge/fragment_player.xml b/app/src/main/res/layout-xlarge/fragment_player.xml
index 74a8b79d..1d6d7a61 100644
--- a/app/src/main/res/layout-xlarge/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge/fragment_player.xml
@@ -37,7 +37,7 @@
 
                 <fragment
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:layout="@layout/fragment_player_album_cover" />
@@ -50,7 +50,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.normal.PlayerPlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_player_playback_controls" />
diff --git a/app/src/main/res/layout/activity_lock_screen_old_style.xml b/app/src/main/res/layout/activity_lock_screen_old_style.xml
index 7f3b6a76..f69bbfb8 100644
--- a/app/src/main/res/layout/activity_lock_screen_old_style.xml
+++ b/app/src/main/res/layout/activity_lock_screen_old_style.xml
@@ -24,7 +24,7 @@
 
         <fragment
             android:id="@+id/playback_controls_fragment"
-            android:name="code.name.monkey.retromusic.ui.fragments.player.lockscreen.LockScreenPlayerControlsFragment"
+            android:name="code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenPlayerControlsFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:layout="@layout/fragment_lock_screen_playback_controls" />
diff --git a/app/src/main/res/layout/activity_whats_new.xml b/app/src/main/res/layout/activity_whats_new.xml
index 55b39a2e..d930c525 100644
--- a/app/src/main/res/layout/activity_whats_new.xml
+++ b/app/src/main/res/layout/activity_whats_new.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="code.name.monkey.retromusic.ui.activities.WhatsNewActivity">
+    tools:context=".activities.WhatsNewActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml
index 20b8aff3..cb921c05 100644
--- a/app/src/main/res/layout/fragment_adaptive_player.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player.xml
@@ -54,7 +54,7 @@
 
                 <fragment
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
 
@@ -67,7 +67,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_adaptive_player_playback_controls" />
diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml
index a8f38133..4f318abf 100644
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@@ -48,7 +48,7 @@
 
                 <fragment
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
@@ -61,7 +61,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
             </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_blur_playback_controls.xml b/app/src/main/res/layout/fragment_blur_playback_controls.xml
index 3d3e4897..1f676fc2 100644
--- a/app/src/main/res/layout/fragment_blur_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_blur_playback_controls.xml
@@ -183,7 +183,7 @@
 
         <fragment
             android:id="@+id/volume_fragment"
-            android:name="code.name.monkey.retromusic.ui.fragments.VolumeFragment"
+            android:name="code.name.monkey.retromusic.fragments.VolumeFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout/fragment_card_blur_player.xml b/app/src/main/res/layout/fragment_card_blur_player.xml
index e1d9cb38..37f33a7c 100644
--- a/app/src/main/res/layout/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player.xml
@@ -69,7 +69,7 @@
 
                     <fragment
                         android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </FrameLayout>
@@ -83,7 +83,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_card_blur_player_playback_controls" />
diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml
index 7125410c..b632b909 100644
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@@ -11,7 +11,7 @@
 
     <fragment
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:layout="@layout/fragment_album_full_cover" />
@@ -68,7 +68,7 @@
 
                     <fragment
                         android:id="@+id/playbackControlsFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.card.CardPlaybackControlsFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         tools:layout="@layout/fragment_card_player_playback_controls" />
diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml
index 121f3688..fb41be13 100644
--- a/app/src/main/res/layout/fragment_classic_player.xml
+++ b/app/src/main/res/layout/fragment_classic_player.xml
@@ -42,7 +42,7 @@
 
                     <fragment
                         android:id="@+id/playerAlbumCoverFragment"
-                        class="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                        class="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
@@ -50,7 +50,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    class="code.name.monkey.retromusic.ui.fragments.player.classic.ClassicPlayerPlaybackControlsFragment"
+                    class="code.name.monkey.retromusic.fragments.player.classic.ClassicPlayerPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/albumCoverContainer" />
diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml
index e8572805..5caf246c 100644
--- a/app/src/main/res/layout/fragment_color_player.xml
+++ b/app/src/main/res/layout/fragment_color_player.xml
@@ -100,7 +100,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.color.ColorPlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_player_playback_controls" />
diff --git a/app/src/main/res/layout/fragment_fit.xml b/app/src/main/res/layout/fragment_fit.xml
index 2fddff91..0c40f173 100644
--- a/app/src/main/res/layout/fragment_fit.xml
+++ b/app/src/main/res/layout/fragment_fit.xml
@@ -20,7 +20,7 @@
 
             <fragment
                 android:id="@+id/playerAlbumCoverFragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 tools:layout="@layout/fragment_album_full_cover" />
@@ -33,7 +33,7 @@
 
             <fragment
                 android:id="@+id/playbackControlsFragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.player.fit.FitPlaybackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.fit.FitPlaybackControlsFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 tools:layout="@layout/fragment_player_playback_controls" />
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index f24de9d1..c1027662 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -51,7 +51,7 @@
 
                 <fragment
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:layout="@layout/fragment_player_album_cover" />
@@ -64,7 +64,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.flat.FlatPlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_flat_player_playback_controls" />
diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml
index f2b0ec48..6d18dc03 100644
--- a/app/src/main/res/layout/fragment_full.xml
+++ b/app/src/main/res/layout/fragment_full.xml
@@ -9,7 +9,7 @@
 
     <fragment
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:layout="@layout/fragment_album_full_cover" />
@@ -32,7 +32,7 @@
 
             <fragment
                 android:id="@+id/playbackControlsFragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.player.full.FullPlaybackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.full.FullPlaybackControlsFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout/fragment_main_options.xml b/app/src/main/res/layout/fragment_main_options.xml
index 83085cd2..158ed5d6 100644
--- a/app/src/main/res/layout/fragment_main_options.xml
+++ b/app/src/main/res/layout/fragment_main_options.xml
@@ -10,10 +10,10 @@
     <LinearLayout
         android:id="@+id/userInfoContainer"
         android:layout_width="match_parent"
-        android:padding="16dp"
-        android:gravity="center_vertical"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="16dp">
 
         <code.name.monkey.retromusic.views.CircularImageView
             android:id="@+id/userImage"
@@ -35,9 +35,9 @@
             <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                 android:id="@+id/titleWelcome"
                 android:layout_width="wrap_content"
-                android:textSize="18sp"
                 android:layout_height="wrap_content"
-                android:padding="0dp" />
+                android:padding="0dp"
+                android:textSize="18sp" />
 
             <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:id="@+id/text"
@@ -72,41 +72,28 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:layout_weight="1"
+            android:orientation="vertical">
 
-            <LinearLayout
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/TextAppearance.MaterialComponents.Overline"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:text="@string/upgrade_to_premium"
+                android:textColor="@color/md_grey_200" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/TextAppearance.MaterialComponents.Overline"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="8dp"
-                    android:text="Upgrade to premium"
-                    android:textColor="@color/md_grey_200" />
-
-                <TextView
-                    style="@style/TextAppearance.MaterialComponents.Headline6"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="8dp"
-                    android:text="@string/buy_pro"
-                    android:textColor="@color/md_white_1000" />
-            </LinearLayout>
-
-            <ImageView
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:contentDescription="TODO"
-                android:src="@drawable/promotional"
-                android:visibility="gone" />
+            <TextView
+                style="@style/TextAppearance.MaterialComponents.Headline6"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:text="@string/buy_pro"
+                android:textColor="@color/md_white_1000" />
         </LinearLayout>
+
     </com.google.android.material.card.MaterialCardView>
 
     <code.name.monkey.retromusic.views.OptionMenuItemView
diff --git a/app/src/main/res/layout/fragment_material.xml b/app/src/main/res/layout/fragment_material.xml
index 9bb6cfd9..8f88cf66 100644
--- a/app/src/main/res/layout/fragment_material.xml
+++ b/app/src/main/res/layout/fragment_material.xml
@@ -32,7 +32,7 @@
 
                 <fragment
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_album_cover" />
@@ -45,7 +45,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.material.MaterialControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.material.MaterialControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_material_playback_controls" />
diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml
index 9f8ad71c..ea7253fb 100644
--- a/app/src/main/res/layout/fragment_plain_player.xml
+++ b/app/src/main/res/layout/fragment_plain_player.xml
@@ -65,7 +65,7 @@
 
                 <fragment
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:layout="@layout/fragment_player_album_cover" />
@@ -78,7 +78,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.plain.PlainPlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_plain_controls_fragment" />
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 02be2931..9d992988 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -44,7 +44,7 @@
 
                 <fragment
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_album_cover" />
@@ -57,7 +57,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.normal.PlayerPlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_player_playback_controls" />
diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml
index ec243aaf..ee29910f 100644
--- a/app/src/main/res/layout/fragment_simple_player.xml
+++ b/app/src/main/res/layout/fragment_simple_player.xml
@@ -34,7 +34,7 @@
 
                 <fragment
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:layout="@layout/fragment_player_album_cover" />
@@ -47,7 +47,7 @@
 
                 <fragment
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.player.simple.SimplePlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_simple_controls_fragment" />
diff --git a/app/src/main/res/layout/fragment_slide_player.xml b/app/src/main/res/layout/fragment_slide_player.xml
index dd6ba6a3..c9da0b5a 100644
--- a/app/src/main/res/layout/fragment_slide_player.xml
+++ b/app/src/main/res/layout/fragment_slide_player.xml
@@ -256,7 +256,7 @@
 
                 <fragment
                     android:id="@+id/volumeFragment"
-                    android:name="code.name.monkey.retromusic.ui.fragments.VolumeFragment"
+                    android:name="code.name.monkey.retromusic.fragments.VolumeFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml
index 48bcc4a0..13d965e7 100644
--- a/app/src/main/res/layout/fragment_tiny_player.xml
+++ b/app/src/main/res/layout/fragment_tiny_player.xml
@@ -10,7 +10,7 @@
 
     <fragment
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:layout="@layout/fragment_player_album_cover" />
@@ -88,7 +88,7 @@
 
                     <fragment
                         android:id="@+id/playbackControlsFragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.tiny.TinyPlaybackControlsFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.tiny.TinyPlaybackControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         tools:layout="@layout/fragment_tiny_controls_fragment" />
diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml
index c4fc58f7..350ea7b9 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -35,7 +35,7 @@
 
             <fragment
                 android:id="@+id/miniPlayerFragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.MiniPlayerFragment"
+                android:name="code.name.monkey.retromusic.fragments.MiniPlayerFragment"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
                 tools:layout="@layout/fragment_mini_player" />
diff --git a/app/src/main/res/layout/volume_controls.xml b/app/src/main/res/layout/volume_controls.xml
index 18d79e3f..4ab64191 100644
--- a/app/src/main/res/layout/volume_controls.xml
+++ b/app/src/main/res/layout/volume_controls.xml
@@ -10,7 +10,7 @@
 
    <!-- <fragment
         android:id="@+id/volumeFragment"
-        android:name="code.name.monkey.retromusic.ui.fragments.VolumeFragment"
+        android:name="code.name.monkey.retromusic.fragments.VolumeFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ff09e626..3d7def9c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -613,5 +613,6 @@
     <string name="other_settings_summary">Advanced testing features</string>
     <string name="on">On</string>
     <string name="select_preset">Select preset</string>
+    <string name="upgrade_to_premium">Upgrade to premium</string>
 
 </resources>
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATECheckBoxPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATECheckBoxPreference.kt
deleted file mode 100644
index 9510c816..00000000
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATECheckBoxPreference.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-package code.name.monkey.appthemehelper.common.prefs
-
-import android.content.Context
-import android.preference.CheckBoxPreference
-import android.preference.Preference
-import android.util.AttributeSet
-import android.view.View
-import android.view.ViewGroup
-import android.widget.CheckBox
-import code.name.monkey.appthemehelper.ATH
-import code.name.monkey.appthemehelper.R
-import code.name.monkey.appthemehelper.ThemeStore
-
-/**
- * @author Aidan Follestad (afollestad)
- */
-class ATECheckBoxPreference : CheckBoxPreference {
-
-    constructor(context: Context) : super(context) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
-        init()
-    }
-
-
-    private fun init() {
-        layoutResource = R.layout.ate_preference_custom
-
-        try {
-            val canRecycleLayoutField = Preference::class.java.getDeclaredField("mCanRecycleLayout")
-            canRecycleLayoutField.isAccessible = true
-            canRecycleLayoutField.setBoolean(this, true)
-        } catch (ignored: Exception) {
-        }
-
-        try {
-            val hasSpecifiedLayout = Preference::class.java.getDeclaredField("mHasSpecifiedLayout")
-            hasSpecifiedLayout.isAccessible = true
-            hasSpecifiedLayout.setBoolean(this, true)
-        } catch (ignored: Exception) {
-        }
-
-    }
-
-    override fun onBindView(view: View) {
-        super.onBindView(view)
-
-        val parentCheckbox = findCheckboxView(view)
-        if (parentCheckbox != null) {
-            ATH.setTint(parentCheckbox, ThemeStore.accentColor(view.context))
-        }
-    }
-
-    private fun findCheckboxView(view: View): View? {
-        if (view is ViewGroup) {
-            for (i in 0 until view.childCount) {
-                val child = view.getChildAt(i)
-                if (child is CheckBox) {
-                    return child
-                } else if (child is ViewGroup) {
-                    val potentialCheckbox = findCheckboxView(child)
-                    if (potentialCheckbox != null) return potentialCheckbox
-                }
-            }
-        } else if (view is CheckBox) {
-            return view
-        }
-        return null
-    }
-}
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEEditTextPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEEditTextPreference.kt
deleted file mode 100644
index 95895769..00000000
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEEditTextPreference.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package code.name.monkey.appthemehelper.common.prefs
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.preference.EditTextPreference
-
-
-/**
- * @author Aidan Follestad (afollestad)
- */
-class ATEEditTextPreference : EditTextPreference {
-
-    constructor(context: Context) : super(context) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
-        init()
-    }
-
-
-    private fun init() {
-        layoutResource = code.name.monkey.appthemehelper.R.layout.ate_preference_custom
-    }
-}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEListPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEListPreference.kt
deleted file mode 100644
index c91fd08a..00000000
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEListPreference.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package code.name.monkey.appthemehelper.common.prefs
-
-import android.content.Context
-import android.util.AttributeSet
-import android.preference.ListPreference
-import code.name.monkey.appthemehelper.R
-
-/**
- * @author Aidan Follestad (afollestad)
- */
-class ATEListPreference : ListPreference {
-
-    constructor(context: Context) : super(context) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
-        init()
-    }
-
-    private fun init() {
-        layoutResource = R.layout.ate_preference_custom
-        if (summary == null || summary.toString().trim { it <= ' ' }.isEmpty())
-            summary = "%s"
-
-    }
-
-}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEMultiSelectPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEMultiSelectPreference.kt
deleted file mode 100644
index cf9a6957..00000000
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEMultiSelectPreference.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package code.name.monkey.appthemehelper.common.prefs
-
-import android.content.Context
-import android.preference.ListPreference
-import android.util.AttributeSet
-import code.name.monkey.appthemehelper.R
-
-/**
- * @author Aidan Follestad (afollestad)
- */
-class ATEMultiSelectPreference :  ListPreference {
-
-    constructor(context: Context) : super(context) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
-        init()
-    }
-
-    private fun init() {
-        layoutResource = R.layout.ate_preference_custom
-    }
-}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEPreference.kt
deleted file mode 100644
index df7c410c..00000000
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEPreference.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package code.name.monkey.appthemehelper.common.prefs
-
-import android.content.Context
-import android.preference.Preference
-import android.util.AttributeSet
-import code.name.monkey.appthemehelper.R
-
-/**
- * @author Aidan Follestad (afollestad)
- */
-class ATEPreference : Preference {
-    constructor(context: Context) : super(context) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
-        init()
-    }
-
-
-    private fun init() {
-        layoutResource = R.layout.ate_preference_custom
-    }
-}
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEPreferenceCategory.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEPreferenceCategory.kt
deleted file mode 100644
index 99408085..00000000
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEPreferenceCategory.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package code.name.monkey.appthemehelper.common.prefs
-
-import android.content.Context
-import android.preference.PreferenceCategory
-import android.util.AttributeSet
-import android.view.View
-import android.widget.TextView
-import code.name.monkey.appthemehelper.ThemeStore
-
-class ATEPreferenceCategory : PreferenceCategory {
-    constructor(context: Context) : super(context) {
-
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
-
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
-
-    }
-
-    override fun onBindView(view: View) {
-        super.onBindView(view)
-        val mTitle = view.findViewById<View>(android.R.id.title) as TextView
-        mTitle.setTextColor(ThemeStore.accentColor(view.context))
-    }
-}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATESwitchPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATESwitchPreference.kt
deleted file mode 100644
index f8958c27..00000000
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATESwitchPreference.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-package code.name.monkey.appthemehelper.common.prefs
-
-import android.annotation.TargetApi
-import android.content.Context
-import android.os.Build
-import android.preference.Preference
-import android.preference.SwitchPreference
-import android.util.AttributeSet
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Switch
-import androidx.appcompat.widget.SwitchCompat
-
-import code.name.monkey.appthemehelper.ATH
-import code.name.monkey.appthemehelper.R
-import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.common.views.ATESwitch
-
-/**
- * @author Aidan Follestad (afollestad)
- */
-class ATESwitchPreference : SwitchPreference {
-
-    private var mSwitch: ATESwitch? = null
-
-    constructor(context: Context) : super(context) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
-        init()
-    }
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
-        init()
-    }
-
-    private fun init() {
-        layoutResource = R.layout.ate_preference_custom
-        if (COMPAT_MODE) {
-            widgetLayoutResource = R.layout.ate_preference_switch
-        } else {
-            try {
-                val canRecycleLayoutField = Preference::class.java.getDeclaredField("mCanRecycleLayout")
-                canRecycleLayoutField.isAccessible = true
-                canRecycleLayoutField.setBoolean(this, true)
-            } catch (ignored: Exception) {
-            }
-
-            try {
-                val hasSpecifiedLayout = Preference::class.java.getDeclaredField("mHasSpecifiedLayout")
-                hasSpecifiedLayout.isAccessible = true
-                hasSpecifiedLayout.setBoolean(this, true)
-            } catch (ignored: Exception) {
-            }
-
-        }
-    }
-
-    override fun onBindView(view: View) {
-        super.onBindView(view)
-        if (COMPAT_MODE) {
-            mSwitch = view.findViewById<View>(R.id.switchWidget) as ATESwitch
-            mSwitch!!.isChecked = isChecked
-        } else {
-            val parentSwitch = findSwitchView(view)
-            if (parentSwitch != null) {
-                ATH.setTint(parentSwitch, ThemeStore.accentColor(view.context))
-            }
-        }
-    }
-
-    private fun findSwitchView(view: View): View? {
-        if (view is ViewGroup) {
-            for (i in 0 until view.childCount) {
-                val child = view.getChildAt(i)
-                if (child is Switch || child is SwitchCompat) {
-                    return child
-                } else if (child is ViewGroup) {
-                    val potentialSwitch = findSwitchView(child)
-                    if (potentialSwitch != null) return potentialSwitch
-                }
-            }
-        } else if (view is Switch || view is SwitchCompat) {
-            return view
-        }
-        return null
-    }
-
-    override fun setChecked(checked: Boolean) {
-        super.setChecked(checked)
-        if (COMPAT_MODE) {
-            if (mSwitch != null) {
-                mSwitch!!.isChecked = checked
-            }
-        }
-    }
-
-    companion object {
-
-        internal val COMPAT_MODE = Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP
-    }
-}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.kt
index dd69f8a0..625c6f3f 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.kt
@@ -3,9 +3,8 @@ package code.name.monkey.appthemehelper.common.prefs.supportv7
 import android.annotation.TargetApi
 import android.content.Context
 import android.os.Build
-import androidx.preference.CheckBoxPreference
 import android.util.AttributeSet
-
+import androidx.preference.CheckBoxPreference
 import code.name.monkey.appthemehelper.R
 
 /**
diff --git a/appthemehelper/src/main/res/drawable/ate_switch.xml b/appthemehelper/src/main/res/drawable/ate_switch.xml
index 05df0204..186e54ef 100644
--- a/appthemehelper/src/main/res/drawable/ate_switch.xml
+++ b/appthemehelper/src/main/res/drawable/ate_switch.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_toggle_switch_off"
-    android:state_checked="false"/>
-  <item android:drawable="@drawable/ic_toggle_switch"
-    android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toggle_switch_off" android:state_checked="false" />
+    <item android:drawable="@drawable/ic_toggle_switch" android:state_checked="true" />
 </selector>
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml b/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
index ecc9e6ca..e53f3a08 100755
--- a/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
+++ b/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?android:attr/selectableItemBackground"
     android:baselineAligned="false"
     android:gravity="center_vertical"
@@ -36,12 +35,12 @@
 
         <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
             android:id="@android:id/title"
+            style="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_alignParentLeft="true"
             android:ellipsize="marquee"
-            style="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:fadingEdge="horizontal"
             android:singleLine="true"
             tools:text="Title" />