diff --git a/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java
index 8a07a1ea..1304a7a6 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java
@@ -26,7 +26,7 @@ import com.dkanada.gramophone.glide.CustomGlideRequest;
 import com.dkanada.gramophone.helper.MusicPlayerRemote;
 import com.dkanada.gramophone.model.Song;
 import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
-import com.dkanada.gramophone.ui.fragments.mainactivity.library.LibraryFragment;
+import com.dkanada.gramophone.fragments.mainactivity.library.LibraryFragment;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.util.QueryUtil;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
diff --git a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
index fa05b232..bde4c165 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
@@ -19,11 +19,11 @@ import com.dkanada.gramophone.R;
 import com.dkanada.gramophone.databinding.SlidingMusicPanelLayoutBinding;
 import com.dkanada.gramophone.helper.MusicPlayerRemote;
 import com.dkanada.gramophone.activities.SplashActivity;
-import com.dkanada.gramophone.ui.fragments.player.AbsPlayerFragment;
-import com.dkanada.gramophone.ui.fragments.player.MiniPlayerFragment;
-import com.dkanada.gramophone.ui.fragments.player.NowPlayingScreen;
-import com.dkanada.gramophone.ui.fragments.player.card.CardPlayerFragment;
-import com.dkanada.gramophone.ui.fragments.player.flat.FlatPlayerFragment;
+import com.dkanada.gramophone.fragments.player.AbsPlayerFragment;
+import com.dkanada.gramophone.fragments.player.MiniPlayerFragment;
+import com.dkanada.gramophone.fragments.player.NowPlayingScreen;
+import com.dkanada.gramophone.fragments.player.card.CardPlayerFragment;
+import com.dkanada.gramophone.fragments.player.flat.FlatPlayerFragment;
 import com.dkanada.gramophone.util.PreferenceUtil;
 import com.dkanada.gramophone.util.ViewUtil;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java
index 954ff883..1f93edde 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java
@@ -11,11 +11,11 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 
 import com.dkanada.gramophone.model.CategoryInfo;
-import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.AlbumsFragment;
-import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.ArtistsFragment;
-import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.GenresFragment;
-import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.PlaylistsFragment;
-import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.SongsFragment;
+import com.dkanada.gramophone.fragments.mainactivity.library.pager.AlbumsFragment;
+import com.dkanada.gramophone.fragments.mainactivity.library.pager.ArtistsFragment;
+import com.dkanada.gramophone.fragments.mainactivity.library.pager.GenresFragment;
+import com.dkanada.gramophone.fragments.mainactivity.library.pager.PlaylistsFragment;
+import com.dkanada.gramophone.fragments.mainactivity.library.pager.SongsFragment;
 import com.dkanada.gramophone.util.PreferenceUtil;
 
 import java.lang.ref.WeakReference;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/AbsMusicServiceFragment.java
similarity index 97%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/AbsMusicServiceFragment.java
index 512ab2b7..1bf7f28e 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/AbsMusicServiceFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments;
+package com.dkanada.gramophone.fragments;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/AbsMainActivityFragment.java
similarity index 88%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/AbsMainActivityFragment.java
index 97447f9d..5a835556 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/AbsMainActivityFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.mainactivity;
+package com.dkanada.gramophone.fragments.mainactivity;
 
 import android.os.Bundle;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java
similarity index 96%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java
index d9624cf9..fa8fb365 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.mainactivity.library;
+package com.dkanada.gramophone.fragments.mainactivity.library;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -33,12 +33,12 @@ import com.dkanada.gramophone.helper.sort.SortOrder;
 import com.dkanada.gramophone.interfaces.CabHolder;
 import com.dkanada.gramophone.activities.MainActivity;
 import com.dkanada.gramophone.activities.SearchActivity;
-import com.dkanada.gramophone.ui.fragments.mainactivity.AbsMainActivityFragment;
-import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
-import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.AlbumsFragment;
-import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.ArtistsFragment;
-import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.PlaylistsFragment;
-import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.SongsFragment;
+import com.dkanada.gramophone.fragments.mainactivity.AbsMainActivityFragment;
+import com.dkanada.gramophone.fragments.mainactivity.library.pager.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
+import com.dkanada.gramophone.fragments.mainactivity.library.pager.AlbumsFragment;
+import com.dkanada.gramophone.fragments.mainactivity.library.pager.ArtistsFragment;
+import com.dkanada.gramophone.fragments.mainactivity.library.pager.PlaylistsFragment;
+import com.dkanada.gramophone.fragments.mainactivity.library.pager.SongsFragment;
 import com.dkanada.gramophone.util.ThemeUtil;
 import com.dkanada.gramophone.util.PreferenceUtil;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java
similarity index 63%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java
index f1501c3c..180a5ea9 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java
@@ -1,9 +1,9 @@
-package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
+package com.dkanada.gramophone.fragments.mainactivity.library.pager;
 
 import android.os.Bundle;
 
-import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
-import com.dkanada.gramophone.ui.fragments.mainactivity.library.LibraryFragment;
+import com.dkanada.gramophone.fragments.AbsMusicServiceFragment;
+import com.dkanada.gramophone.fragments.mainactivity.library.LibraryFragment;
 
 public class AbsLibraryPagerFragment extends AbsMusicServiceFragment {
     public LibraryFragment getLibraryFragment() {
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
index e621c1ac..642fc146 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
+package com.dkanada.gramophone.fragments.mainactivity.library.pager;
 
 import android.os.Bundle;
 import android.view.View;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java
index d88cf473..4e9b8af1 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
+package com.dkanada.gramophone.fragments.mainactivity.library.pager;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AlbumsFragment.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AlbumsFragment.java
index 397daf42..c78bd2c0 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AlbumsFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
+package com.dkanada.gramophone.fragments.mainactivity.library.pager;
 
 import android.os.Bundle;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/ArtistsFragment.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/ArtistsFragment.java
index 207f56fa..3703a751 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/ArtistsFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
+package com.dkanada.gramophone.fragments.mainactivity.library.pager;
 
 import android.os.Bundle;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/GenresFragment.java
similarity index 97%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/GenresFragment.java
index b2a3ab7a..4bd5fef3 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/GenresFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
+package com.dkanada.gramophone.fragments.mainactivity.library.pager;
 
 import android.os.Bundle;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/PlaylistsFragment.java
similarity index 97%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/PlaylistsFragment.java
index 11e92b7d..da159a75 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/PlaylistsFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
+package com.dkanada.gramophone.fragments.mainactivity.library.pager;
 
 import android.os.Bundle;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/SongsFragment.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/SongsFragment.java
index 38261f28..98c557a7 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/SongsFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
+package com.dkanada.gramophone.fragments.mainactivity.library.pager;
 
 import android.os.Bundle;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/AbsPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java
similarity index 97%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/player/AbsPlayerFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java
index 36980c4e..980c841e 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/AbsPlayerFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.player;
+package com.dkanada.gramophone.fragments.player;
 
 import android.content.Context;
 import android.view.MenuItem;
@@ -18,7 +18,7 @@ import com.dkanada.gramophone.interfaces.PaletteColorHolder;
 import com.dkanada.gramophone.model.Album;
 import com.dkanada.gramophone.model.Artist;
 import com.dkanada.gramophone.model.Song;
-import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
+import com.dkanada.gramophone.fragments.AbsMusicServiceFragment;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.util.NavigationUtil;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/MiniPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/MiniPlayerFragment.java
similarity index 97%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/player/MiniPlayerFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/player/MiniPlayerFragment.java
index cc57c5da..ad3dae51 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/MiniPlayerFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/MiniPlayerFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.player;
+package com.dkanada.gramophone.fragments.player;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -21,7 +21,7 @@ import com.dkanada.gramophone.R;
 import com.dkanada.gramophone.helper.MusicPlayerRemote;
 import com.dkanada.gramophone.helper.MusicProgressViewUpdateHelper;
 import com.dkanada.gramophone.helper.PlayPauseButtonOnClickHandler;
-import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
+import com.dkanada.gramophone.fragments.AbsMusicServiceFragment;
 import com.dkanada.gramophone.views.PlayPauseDrawable;
 
 public class MiniPlayerFragment extends AbsMusicServiceFragment implements MusicProgressViewUpdateHelper.Callback {
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/NowPlayingScreen.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/NowPlayingScreen.java
similarity index 91%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/player/NowPlayingScreen.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/player/NowPlayingScreen.java
index 78674e97..0c932b0d 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/NowPlayingScreen.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/NowPlayingScreen.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.player;
+package com.dkanada.gramophone.fragments.player;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/PlayerAlbumCoverFragment.java
similarity index 97%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/player/PlayerAlbumCoverFragment.java
index e9a97e48..d89b1673 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/PlayerAlbumCoverFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.player;
+package com.dkanada.gramophone.fragments.player;
 
 import android.animation.Animator;
 import android.annotation.SuppressLint;
@@ -18,7 +18,7 @@ import com.dkanada.gramophone.adapter.AlbumCoverPagerAdapter;
 import com.dkanada.gramophone.databinding.FragmentPlayerAlbumCoverBinding;
 import com.dkanada.gramophone.helper.MusicPlayerRemote;
 import com.dkanada.gramophone.misc.SimpleAnimatorListener;
-import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
+import com.dkanada.gramophone.fragments.AbsMusicServiceFragment;
 import com.dkanada.gramophone.util.ViewUtil;
 
 public class PlayerAlbumCoverFragment extends AbsMusicServiceFragment implements ViewPager.OnPageChangeListener {
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java
similarity index 99%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java
index bbe4cbc2..bf4e453a 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.player.card;
+package com.dkanada.gramophone.fragments.player.card;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -38,8 +38,8 @@ import com.dkanada.gramophone.helper.MusicPlayerRemote;
 import com.dkanada.gramophone.helper.menu.SongMenuHelper;
 import com.dkanada.gramophone.model.Song;
 import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
-import com.dkanada.gramophone.ui.fragments.player.AbsPlayerFragment;
-import com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment;
+import com.dkanada.gramophone.fragments.player.AbsPlayerFragment;
+import com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment;
 import com.dkanada.gramophone.util.ImageUtil;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.util.Util;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerPlaybackControlsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerPlaybackControlsFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java
index 2fa6077d..27ca838e 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerPlaybackControlsFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.player.card;
+package com.dkanada.gramophone.fragments.player.card;
 
 import android.graphics.Color;
 import android.graphics.PorterDuff;
@@ -21,7 +21,7 @@ import com.dkanada.gramophone.helper.MusicProgressViewUpdateHelper;
 import com.dkanada.gramophone.helper.PlayPauseButtonOnClickHandler;
 import com.dkanada.gramophone.misc.SimpleOnSeekbarChangeListener;
 import com.dkanada.gramophone.service.MusicService;
-import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
+import com.dkanada.gramophone.fragments.AbsMusicServiceFragment;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.views.PlayPauseDrawable;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java
index 9e045dd1..1262d955 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.player.flat;
+package com.dkanada.gramophone.fragments.player.flat;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -36,8 +36,8 @@ import com.dkanada.gramophone.helper.MusicPlayerRemote;
 import com.dkanada.gramophone.helper.menu.SongMenuHelper;
 import com.dkanada.gramophone.model.Song;
 import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
-import com.dkanada.gramophone.ui.fragments.player.AbsPlayerFragment;
-import com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment;
+import com.dkanada.gramophone.fragments.player.AbsPlayerFragment;
+import com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment;
 import com.dkanada.gramophone.util.ImageUtil;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.util.Util;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java
rename to app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java
index cc00b296..2a7fee35 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.fragments.player.flat;
+package com.dkanada.gramophone.fragments.player.flat;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -23,7 +23,7 @@ import com.dkanada.gramophone.helper.MusicProgressViewUpdateHelper;
 import com.dkanada.gramophone.helper.PlayPauseButtonOnClickHandler;
 import com.dkanada.gramophone.misc.SimpleOnSeekbarChangeListener;
 import com.dkanada.gramophone.service.MusicService;
-import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
+import com.dkanada.gramophone.fragments.AbsMusicServiceFragment;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.views.PlayPauseDrawable;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
index 8a908408..c7c1e70d 100644
--- a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
@@ -19,7 +19,7 @@ import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.heinrichreimersoftware.materialintro.view.InkPageIndicator;
 import com.dkanada.gramophone.R;
-import com.dkanada.gramophone.ui.fragments.player.NowPlayingScreen;
+import com.dkanada.gramophone.fragments.player.NowPlayingScreen;
 import com.dkanada.gramophone.util.PreferenceUtil;
 import com.dkanada.gramophone.util.ViewUtil;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java
index 5743a737..7217d2f6 100644
--- a/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java
+++ b/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java
@@ -15,7 +15,7 @@ import com.dkanada.gramophone.helper.sort.SortMethod;
 import com.dkanada.gramophone.helper.sort.SortOrder;
 import com.dkanada.gramophone.model.CategoryInfo;
 import com.dkanada.gramophone.model.DirectPlayCodec;
-import com.dkanada.gramophone.ui.fragments.player.NowPlayingScreen;
+import com.dkanada.gramophone.fragments.player.NowPlayingScreen;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
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 ba8f2445..a4a899f2 100644
--- a/app/src/main/res/layout-land/fragment_card_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_player.xml
@@ -30,7 +30,7 @@
 
                 <fragment
                     android:id="@+id/player_album_cover_fragment"
-                    class="com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment"
+                    class="com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
 
@@ -61,7 +61,7 @@
 
                     <fragment
                         android:id="@+id/playback_controls_fragment"
-                        class="com.dkanada.gramophone.ui.fragments.player.card.CardPlayerPlaybackControlsFragment"
+                        class="com.dkanada.gramophone.fragments.player.card.CardPlayerPlaybackControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
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 925cf52a..2426470a 100644
--- a/app/src/main/res/layout-land/fragment_flat_player.xml
+++ b/app/src/main/res/layout-land/fragment_flat_player.xml
@@ -39,7 +39,7 @@
 
             <fragment
                 android:id="@+id/player_album_cover_fragment"
-                class="com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment"
+                class="com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
 
@@ -53,7 +53,7 @@
 
             <fragment
                 android:id="@+id/playback_controls_fragment"
-                class="com.dkanada.gramophone.ui.fragments.player.flat.FlatPlayerPlaybackControlsFragment"
+                class="com.dkanada.gramophone.fragments.player.flat.FlatPlayerPlaybackControlsFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml
index 4337a0df..f9dac10c 100644
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@@ -41,7 +41,7 @@
 
                     <fragment
                         android:id="@+id/player_album_cover_fragment"
-                        class="com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment"
+                        class="com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
@@ -49,7 +49,7 @@
 
                 <fragment
                     android:id="@+id/playback_controls_fragment"
-                    class="com.dkanada.gramophone.ui.fragments.player.card.CardPlayerPlaybackControlsFragment"
+                    class="com.dkanada.gramophone.fragments.player.card.CardPlayerPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/album_cover_container" />
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index 35c40bba..399bc61d 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -48,7 +48,7 @@
 
                     <fragment
                         android:id="@+id/player_album_cover_fragment"
-                        class="com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment"
+                        class="com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
@@ -79,7 +79,7 @@
 
             <fragment
                 android:id="@+id/playback_controls_fragment"
-                class="com.dkanada.gramophone.ui.fragments.player.flat.FlatPlayerPlaybackControlsFragment"
+                class="com.dkanada.gramophone.fragments.player.flat.FlatPlayerPlaybackControlsFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 9dbb0464..a36db8e9 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.fragments.mainactivity.library.LibraryFragment">
+    tools:context=".fragments.mainactivity.library.LibraryFragment">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
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 89144188..a0c673c3 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -27,7 +27,7 @@
 
         <fragment
             android:id="@+id/mini_player_fragment"
-            class="com.dkanada.gramophone.ui.fragments.player.MiniPlayerFragment"
+            class="com.dkanada.gramophone.fragments.player.MiniPlayerFragment"
             android:layout_width="match_parent"
             android:layout_height="@dimen/mini_player_height" />