diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 374fdfd9..90d7078b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -62,7 +62,7 @@
             android:label="@string/select"
             android:theme="@style/LoginScreen" />
         <activity
-            android:name=".shortcuts.AppShortcutLauncherActivity"
+            android:name=".views.shortcuts.AppShortcutLauncherActivity"
             android:launchMode="singleInstance"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
@@ -83,7 +83,7 @@
             android:name="com.lge.support.SPLIT_WINDOW"
             android:value="true" />
 
-        <receiver android:name=".widgets.BootReceiver">
+        <receiver android:name=".views.widgets.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
@@ -91,7 +91,7 @@
         </receiver>
 
         <receiver
-            android:name=".widgets.AppWidgetAlbum"
+            android:name=".views.widgets.AppWidgetAlbum"
             android:exported="false"
             android:label="@string/widget_big">
             <intent-filter>
@@ -103,7 +103,7 @@
                 android:resource="@xml/widget_album" />
         </receiver>
         <receiver
-            android:name=".widgets.AppWidgetClassic"
+            android:name=".views.widgets.AppWidgetClassic"
             android:exported="false"
             android:label="@string/widget_classic">
             <intent-filter>
@@ -115,7 +115,7 @@
                 android:resource="@xml/widget_classic" />
         </receiver>
         <receiver
-            android:name=".widgets.AppWidgetCard"
+            android:name=".views.widgets.AppWidgetCard"
             android:exported="false"
             android:label="@string/widget_card">
             <intent-filter>
diff --git a/app/src/main/java/com/dkanada/gramophone/App.java b/app/src/main/java/com/dkanada/gramophone/App.java
index d4c3f760..fa558bcd 100644
--- a/app/src/main/java/com/dkanada/gramophone/App.java
+++ b/app/src/main/java/com/dkanada/gramophone/App.java
@@ -12,7 +12,7 @@ import com.dkanada.gramophone.database.JellyDatabase;
 import com.dkanada.gramophone.helper.EventListener;
 import com.dkanada.gramophone.util.PreferenceUtil;
 import com.kabouzeid.appthemehelper.ThemeStore;
-import com.dkanada.gramophone.shortcuts.DynamicShortcutManager;
+import com.dkanada.gramophone.views.shortcuts.DynamicShortcutManager;
 import com.melegy.redscreenofdeath.RedScreenOfDeath;
 
 import org.jellyfin.apiclient.interaction.AndroidDevice;
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 5ebf968e..e0b30484 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.R;
 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.activities.base.AbsMusicPanelActivity;
 import com.dkanada.gramophone.fragments.mainactivity.library.LibraryFragment;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.util.QueryUtil;
@@ -36,7 +36,7 @@ import org.jellyfin.apiclient.model.dto.BaseItemDto;
 
 import java.util.List;
 
-public class MainActivity extends AbsSlidingMusicPanelActivity {
+public class MainActivity extends AbsMusicPanelActivity {
     private ActivityMainDrawerLayoutBinding binding;
     private ActivityMainContentBinding contentBinding;
     private NavigationDrawerHeaderBinding navigationBinding;
diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
index e9f46d1b..7e7cb37a 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
@@ -24,7 +24,7 @@ import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEColorPreference;
 import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceFragmentCompat;
 import com.kabouzeid.appthemehelper.util.ColorUtil;
 import com.dkanada.gramophone.R;
-import com.dkanada.gramophone.shortcuts.DynamicShortcutManager;
+import com.dkanada.gramophone.views.shortcuts.DynamicShortcutManager;
 import com.dkanada.gramophone.preferences.CategoryPreference;
 import com.dkanada.gramophone.preferences.CategoryPreferenceDialog;
 import com.dkanada.gramophone.preferences.NowPlayingScreenPreference;
diff --git a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsMusicPanelActivity.java
similarity index 97%
rename from app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/base/AbsMusicPanelActivity.java
index bde4c165..2e97984b 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsMusicPanelActivity.java
@@ -28,7 +28,7 @@ import com.dkanada.gramophone.util.PreferenceUtil;
 import com.dkanada.gramophone.util.ViewUtil;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 
-public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivity implements SlidingUpPanelLayout.PanelSlideListener, CardPlayerFragment.Callbacks {
+public abstract class AbsMusicPanelActivity extends AbsMusicServiceActivity implements SlidingUpPanelLayout.PanelSlideListener, CardPlayerFragment.Callbacks {
     private SlidingMusicPanelLayoutBinding binding;
 
     private int navigationbarColor;
@@ -271,7 +271,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
                     .setDuration(ViewUtil.PHONOGRAPH_ANIM_TIME);
 
             navigationBarColorAnimator.setInterpolator(new PathInterpolator(0.4f, 0f, 1f, 1f));
-            navigationBarColorAnimator.addUpdateListener(animation -> AbsSlidingMusicPanelActivity.super.setNavigationbarColor((Integer) animation.getAnimatedValue()));
+            navigationBarColorAnimator.addUpdateListener(animation -> AbsMusicPanelActivity.super.setNavigationbarColor((Integer) animation.getAnimatedValue()));
             navigationBarColorAnimator.start();
         }
     }
diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java
index 44aba7f5..0bfbf0e5 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java
@@ -29,7 +29,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.activities.base.AbsSlidingMusicPanelActivity;
+import com.dkanada.gramophone.activities.base.AbsMusicPanelActivity;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.util.NavigationUtil;
 import com.dkanada.gramophone.util.ThemeUtil;
@@ -39,7 +39,7 @@ import org.jellyfin.apiclient.model.querying.ItemQuery;
 
 import java.util.List;
 
-public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements PaletteColorHolder, CabHolder, AppBarLayout.OnOffsetChangedListener {
+public class AlbumDetailActivity extends AbsMusicPanelActivity implements PaletteColorHolder, CabHolder, AppBarLayout.OnOffsetChangedListener {
     public static final String EXTRA_ALBUM = "extra_album";
 
     private ActivityAlbumDetailBinding binding;
diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java
index 97aa428c..0f84b1e7 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java
@@ -31,7 +31,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.activities.base.AbsSlidingMusicPanelActivity;
+import com.dkanada.gramophone.activities.base.AbsMusicPanelActivity;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.util.ThemeUtil;
 import com.dkanada.gramophone.util.PreferenceUtil;
@@ -41,7 +41,7 @@ import org.jellyfin.apiclient.model.querying.ItemQuery;
 
 import java.util.List;
 
-public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implements PaletteColorHolder, CabHolder, AppBarLayout.OnOffsetChangedListener {
+public class ArtistDetailActivity extends AbsMusicPanelActivity implements PaletteColorHolder, CabHolder, AppBarLayout.OnOffsetChangedListener {
     public static final String EXTRA_ARTIST = "extra_artist";
 
     private ActivityArtistDetailBinding binding;
diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java
index ec4c3c39..738a03c8 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java
@@ -20,7 +20,7 @@ import com.dkanada.gramophone.interfaces.CabHolder;
 import com.dkanada.gramophone.interfaces.MediaCallback;
 import com.dkanada.gramophone.model.Genre;
 import com.dkanada.gramophone.model.Song;
-import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
+import com.dkanada.gramophone.activities.base.AbsMusicPanelActivity;
 import com.dkanada.gramophone.util.ThemeUtil;
 import com.dkanada.gramophone.util.QueryUtil;
 import com.dkanada.gramophone.util.ViewUtil;
@@ -31,7 +31,7 @@ import org.jellyfin.apiclient.model.querying.ItemQuery;
 import java.util.ArrayList;
 import java.util.List;
 
-public class GenreDetailActivity extends AbsSlidingMusicPanelActivity implements CabHolder {
+public class GenreDetailActivity extends AbsMusicPanelActivity implements CabHolder {
     public static final String EXTRA_GENRE = "extra_genre";
 
     private ActivityGenreDetailBinding binding;
diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java
index d4831e76..5808982b 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java
@@ -26,7 +26,7 @@ import com.dkanada.gramophone.interfaces.MediaCallback;
 import com.dkanada.gramophone.model.Playlist;
 import com.dkanada.gramophone.model.PlaylistSong;
 import com.dkanada.gramophone.model.Song;
-import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
+import com.dkanada.gramophone.activities.base.AbsMusicPanelActivity;
 import com.dkanada.gramophone.util.ThemeUtil;
 import com.dkanada.gramophone.util.PlaylistUtil;
 import com.dkanada.gramophone.util.ViewUtil;
@@ -37,7 +37,7 @@ import org.jellyfin.apiclient.model.playlists.PlaylistItemQuery;
 import java.util.ArrayList;
 import java.util.List;
 
-public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity implements CabHolder {
+public class PlaylistDetailActivity extends AbsMusicPanelActivity implements CabHolder {
     public static String EXTRA_PLAYLIST = "extra_playlist";
 
     private ActivityPlaylistDetailBinding binding;
diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java
index 0f32f803..0d1a85df 100644
--- a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java
@@ -37,7 +37,7 @@ import com.dkanada.gramophone.dialogs.SongShareDialog;
 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.activities.base.AbsMusicPanelActivity;
 import com.dkanada.gramophone.fragments.player.AbsPlayerFragment;
 import com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment;
 import com.dkanada.gramophone.util.ImageUtil;
@@ -439,7 +439,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
             }
 
             binding.playerSlidingLayout.setPanelHeight(Math.max(minPanelHeight, availablePanelHeight));
-            ((AbsSlidingMusicPanelActivity) fragment.getActivity()).setAntiDragView(binding.playerSlidingLayout.findViewById(R.id.player_panel));
+            ((AbsMusicPanelActivity) fragment.getActivity()).setAntiDragView(binding.playerSlidingLayout.findViewById(R.id.player_panel));
         }
 
         @Override
@@ -473,7 +473,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
             int panelHeight = binding.playerSlidingLayout.getHeight() - fragment.playbackControlsFragment.getView().getHeight();
             binding.playerSlidingLayout.setPanelHeight(panelHeight);
 
-            ((AbsSlidingMusicPanelActivity) fragment.getActivity()).setAntiDragView(binding.playerSlidingLayout.findViewById(R.id.player_panel));
+            ((AbsMusicPanelActivity) fragment.getActivity()).setAntiDragView(binding.playerSlidingLayout.findViewById(R.id.player_panel));
         }
 
         @Override
diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java
index 1195c0d3..48d4ebb7 100644
--- a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java
@@ -35,7 +35,7 @@ import com.dkanada.gramophone.dialogs.SongShareDialog;
 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.activities.base.AbsMusicPanelActivity;
 import com.dkanada.gramophone.fragments.player.AbsPlayerFragment;
 import com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment;
 import com.dkanada.gramophone.util.ImageUtil;
@@ -426,7 +426,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
             }
 
             binding.playerSlidingLayout.setPanelHeight(Math.max(minPanelHeight, availablePanelHeight));
-            ((AbsSlidingMusicPanelActivity) fragment.getActivity()).setAntiDragView(binding.playerSlidingLayout.findViewById(R.id.player_panel));
+            ((AbsMusicPanelActivity) fragment.getActivity()).setAntiDragView(binding.playerSlidingLayout.findViewById(R.id.player_panel));
         }
 
         @Override
@@ -455,7 +455,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
 
         @Override
         public void setUpPanelAndAlbumCoverHeight() {
-            ((AbsSlidingMusicPanelActivity) fragment.getActivity()).setAntiDragView(fragment.getView().findViewById(R.id.player_panel));
+            ((AbsMusicPanelActivity) fragment.getActivity()).setAntiDragView(fragment.getView().findViewById(R.id.player_panel));
         }
 
         @Override
diff --git a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
index 3e2c455e..cfeb1abd 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
@@ -49,9 +49,9 @@ import com.dkanada.gramophone.service.playback.LocalPlayer;
 import com.dkanada.gramophone.service.playback.Playback;
 import com.dkanada.gramophone.util.PreferenceUtil;
 import com.dkanada.gramophone.util.Util;
-import com.dkanada.gramophone.widgets.AppWidgetAlbum;
-import com.dkanada.gramophone.widgets.AppWidgetCard;
-import com.dkanada.gramophone.widgets.AppWidgetClassic;
+import com.dkanada.gramophone.views.widgets.AppWidgetAlbum;
+import com.dkanada.gramophone.views.widgets.AppWidgetCard;
+import com.dkanada.gramophone.views.widgets.AppWidgetClassic;
 
 import org.jellyfin.apiclient.interaction.EmptyResponse;
 import org.jellyfin.apiclient.interaction.Response;
diff --git a/app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutIconGenerator.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutIconGenerator.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutIconGenerator.java
rename to app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutIconGenerator.java
index a1828ae5..bb37b85d 100644
--- a/app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutIconGenerator.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutIconGenerator.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.shortcuts;
+package com.dkanada.gramophone.views.shortcuts;
 
 import android.content.Context;
 import android.graphics.drawable.AdaptiveIconDrawable;
diff --git a/app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutLauncherActivity.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutLauncherActivity.java
similarity index 85%
rename from app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutLauncherActivity.java
rename to app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutLauncherActivity.java
index a3a53edc..1f36d3f1 100644
--- a/app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutLauncherActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutLauncherActivity.java
@@ -1,17 +1,17 @@
-package com.dkanada.gramophone.shortcuts;
+package com.dkanada.gramophone.views.shortcuts;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.dkanada.gramophone.shortcuts.shortcuttype.LatestShortcutType;
-import com.dkanada.gramophone.shortcuts.shortcuttype.ShuffleShortcutType;
-import com.dkanada.gramophone.shortcuts.shortcuttype.FrequentShortcutType;
+import com.dkanada.gramophone.views.shortcuts.shortcuttype.LatestShortcutType;
+import com.dkanada.gramophone.views.shortcuts.shortcuttype.ShuffleShortcutType;
+import com.dkanada.gramophone.views.shortcuts.shortcuttype.FrequentShortcutType;
 import com.dkanada.gramophone.model.Playlist;
 import com.dkanada.gramophone.service.MusicService;
 
 public class AppShortcutLauncherActivity extends Activity {
-    public static final String KEY_SHORTCUT_TYPE = "com.dkanada.gramophone.shortcuts.ShortcutType";
+    public static final String KEY_SHORTCUT_TYPE = "com.dkanada.gramophone.views.shortcuts.ShortcutType";
 
     public static final int SHORTCUT_TYPE_SHUFFLE = 0;
     public static final int SHORTCUT_TYPE_FREQUENT = 1;
diff --git a/app/src/main/java/com/dkanada/gramophone/shortcuts/DynamicShortcutManager.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/DynamicShortcutManager.java
similarity index 86%
rename from app/src/main/java/com/dkanada/gramophone/shortcuts/DynamicShortcutManager.java
rename to app/src/main/java/com/dkanada/gramophone/views/shortcuts/DynamicShortcutManager.java
index 8b344ce4..21812fdc 100644
--- a/app/src/main/java/com/dkanada/gramophone/shortcuts/DynamicShortcutManager.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/DynamicShortcutManager.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.shortcuts;
+package com.dkanada.gramophone.views.shortcuts;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -8,9 +8,9 @@ import android.content.pm.ShortcutManager;
 import android.graphics.drawable.Icon;
 import android.os.Build;
 
-import com.dkanada.gramophone.shortcuts.shortcuttype.LatestShortcutType;
-import com.dkanada.gramophone.shortcuts.shortcuttype.ShuffleShortcutType;
-import com.dkanada.gramophone.shortcuts.shortcuttype.FrequentShortcutType;
+import com.dkanada.gramophone.views.shortcuts.shortcuttype.LatestShortcutType;
+import com.dkanada.gramophone.views.shortcuts.shortcuttype.ShuffleShortcutType;
+import com.dkanada.gramophone.views.shortcuts.shortcuttype.FrequentShortcutType;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/BaseShortcutType.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/BaseShortcutType.java
similarity index 83%
rename from app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/BaseShortcutType.java
rename to app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/BaseShortcutType.java
index a09a85f5..4ffe5ab1 100644
--- a/app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/BaseShortcutType.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/BaseShortcutType.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.shortcuts.shortcuttype;
+package com.dkanada.gramophone.views.shortcuts.shortcuttype;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -7,12 +7,12 @@ import android.content.pm.ShortcutInfo;
 import android.os.Build;
 import android.os.Bundle;
 
-import com.dkanada.gramophone.shortcuts.AppShortcutLauncherActivity;
+import com.dkanada.gramophone.views.shortcuts.AppShortcutLauncherActivity;
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 public abstract class BaseShortcutType {
 
-    static final String ID_PREFIX = "com.dkanada.gramophone.shortcuts.id.";
+    static final String ID_PREFIX = "com.dkanada.gramophone.views.shortcuts.id.";
 
     Context context;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/FrequentShortcutType.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/FrequentShortcutType.java
similarity index 80%
rename from app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/FrequentShortcutType.java
rename to app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/FrequentShortcutType.java
index 0b078c9c..b118f498 100644
--- a/app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/FrequentShortcutType.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/FrequentShortcutType.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.shortcuts.shortcuttype;
+package com.dkanada.gramophone.views.shortcuts.shortcuttype;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -6,8 +6,8 @@ import android.content.pm.ShortcutInfo;
 import android.os.Build;
 
 import com.dkanada.gramophone.R;
-import com.dkanada.gramophone.shortcuts.AppShortcutIconGenerator;
-import com.dkanada.gramophone.shortcuts.AppShortcutLauncherActivity;
+import com.dkanada.gramophone.views.shortcuts.AppShortcutIconGenerator;
+import com.dkanada.gramophone.views.shortcuts.AppShortcutLauncherActivity;
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 public final class FrequentShortcutType extends BaseShortcutType {
diff --git a/app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/LatestShortcutType.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/LatestShortcutType.java
similarity index 80%
rename from app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/LatestShortcutType.java
rename to app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/LatestShortcutType.java
index 3fe20cc4..9641bb0a 100644
--- a/app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/LatestShortcutType.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/LatestShortcutType.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.shortcuts.shortcuttype;
+package com.dkanada.gramophone.views.shortcuts.shortcuttype;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -6,8 +6,8 @@ import android.content.pm.ShortcutInfo;
 import android.os.Build;
 
 import com.dkanada.gramophone.R;
-import com.dkanada.gramophone.shortcuts.AppShortcutIconGenerator;
-import com.dkanada.gramophone.shortcuts.AppShortcutLauncherActivity;
+import com.dkanada.gramophone.views.shortcuts.AppShortcutIconGenerator;
+import com.dkanada.gramophone.views.shortcuts.AppShortcutLauncherActivity;
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 public final class LatestShortcutType extends BaseShortcutType {
diff --git a/app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/ShuffleShortcutType.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/ShuffleShortcutType.java
similarity index 80%
rename from app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/ShuffleShortcutType.java
rename to app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/ShuffleShortcutType.java
index 2d7cf3a4..679890c1 100644
--- a/app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/ShuffleShortcutType.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/ShuffleShortcutType.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.shortcuts.shortcuttype;
+package com.dkanada.gramophone.views.shortcuts.shortcuttype;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -6,8 +6,8 @@ import android.content.pm.ShortcutInfo;
 import android.os.Build;
 
 import com.dkanada.gramophone.R;
-import com.dkanada.gramophone.shortcuts.AppShortcutIconGenerator;
-import com.dkanada.gramophone.shortcuts.AppShortcutLauncherActivity;
+import com.dkanada.gramophone.views.shortcuts.AppShortcutIconGenerator;
+import com.dkanada.gramophone.views.shortcuts.AppShortcutLauncherActivity;
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 public final class ShuffleShortcutType extends BaseShortcutType {
diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java b/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetAlbum.java
similarity index 99%
rename from app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java
rename to app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetAlbum.java
index 0c3cbf47..d2ff047c 100644
--- a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetAlbum.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.widgets;
+package com.dkanada.gramophone.views.widgets;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java b/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetCard.java
similarity index 99%
rename from app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java
rename to app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetCard.java
index d37965fa..b6feccb8 100644
--- a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetCard.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.widgets;
+package com.dkanada.gramophone.views.widgets;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java b/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetClassic.java
similarity index 99%
rename from app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java
rename to app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetClassic.java
index 66ee478f..affed4cd 100644
--- a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetClassic.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.widgets;
+package com.dkanada.gramophone.views.widgets;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/BaseAppWidget.java b/app/src/main/java/com/dkanada/gramophone/views/widgets/BaseAppWidget.java
similarity index 99%
rename from app/src/main/java/com/dkanada/gramophone/widgets/BaseAppWidget.java
rename to app/src/main/java/com/dkanada/gramophone/views/widgets/BaseAppWidget.java
index 47a07d1f..6af02747 100644
--- a/app/src/main/java/com/dkanada/gramophone/widgets/BaseAppWidget.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/widgets/BaseAppWidget.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.widgets;
+package com.dkanada.gramophone.views.widgets;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/BootReceiver.java b/app/src/main/java/com/dkanada/gramophone/views/widgets/BootReceiver.java
similarity index 96%
rename from app/src/main/java/com/dkanada/gramophone/widgets/BootReceiver.java
rename to app/src/main/java/com/dkanada/gramophone/views/widgets/BootReceiver.java
index 25761843..d9f4024a 100644
--- a/app/src/main/java/com/dkanada/gramophone/widgets/BootReceiver.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/widgets/BootReceiver.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.widgets;
+package com.dkanada.gramophone.views.widgets;
 
 import android.appwidget.AppWidgetManager;
 import android.content.BroadcastReceiver;