diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4d0167ab..d93acfe4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.kabouzeid.gramophone">
+    package="com.dkanada.gramophone">
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -12,7 +12,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
-        android:name="com.dkanada.gramophone.App"
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -20,13 +20,13 @@
         android:usesCleartextTraffic="true"
         android:theme="@style/Theme.Phonograph.Light"
         tools:ignore="UnusedAttribute">
-        <activity android:name="com.dkanada.gramophone.ui.activities.MainActivity" />
-        <activity android:name="com.dkanada.gramophone.ui.activities.AlbumDetailActivity" />
-        <activity android:name="com.dkanada.gramophone.ui.activities.ArtistDetailActivity" />
-        <activity android:name="com.dkanada.gramophone.ui.activities.GenreDetailActivity" />
-        <activity android:name="com.dkanada.gramophone.ui.activities.PlaylistDetailActivity" />
-        <activity android:name="com.dkanada.gramophone.ui.activities.SearchActivity" />
-        <activity android:name="com.dkanada.gramophone.ui.activities.SplashActivity">
+        <activity android:name=".ui.activities.MainActivity" />
+        <activity android:name=".ui.activities.AlbumDetailActivity" />
+        <activity android:name=".ui.activities.ArtistDetailActivity" />
+        <activity android:name=".ui.activities.GenreDetailActivity" />
+        <activity android:name=".ui.activities.PlaylistDetailActivity" />
+        <activity android:name=".ui.activities.SearchActivity" />
+        <activity android:name=".ui.activities.SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MUSIC_PLAYER" />
@@ -45,24 +45,24 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.dkanada.gramophone.ui.activities.SettingsActivity"
+            android:name=".ui.activities.SettingsActivity"
             android:label="@string/action_settings" />
         <activity
-            android:name="com.dkanada.gramophone.ui.activities.AboutActivity"
+            android:name=".ui.activities.AboutActivity"
             android:label="@string/action_about" />
         <activity
-            android:name="com.dkanada.gramophone.ui.activities.LoginActivity"
+            android:name=".ui.activities.LoginActivity"
             android:label="@string/action_login" />
         <activity
-            android:name="com.dkanada.gramophone.shortcuts.AppShortcutLauncherActivity"
+            android:name=".shortcuts.AppShortcutLauncherActivity"
             android:launchMode="singleInstance"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
         <service
-            android:name="com.dkanada.gramophone.service.MusicService"
+            android:name=".service.MusicService"
             android:enabled="true" />
 
-        <receiver android:name="com.dkanada.gramophone.service.MediaButtonIntentReceiver">
+        <receiver android:name=".service.MediaButtonIntentReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
@@ -78,7 +78,7 @@
             android:name="com.bumptech.glide.integration.okhttp3.OkHttpGlideModule"
             android:value="GlideModule" />
 
-        <receiver android:name="com.dkanada.gramophone.widgets.BootReceiver">
+        <receiver android:name=".widgets.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
@@ -86,7 +86,7 @@
         </receiver>
 
         <receiver
-            android:name="com.dkanada.gramophone.widgets.AppWidgetAlbum"
+            android:name=".widgets.AppWidgetAlbum"
             android:exported="false"
             android:label="@string/app_widget_big_name">
             <intent-filter>
@@ -98,7 +98,7 @@
                 android:resource="@xml/app_widget_album_info" />
         </receiver>
         <receiver
-            android:name="com.dkanada.gramophone.widgets.AppWidgetClassic"
+            android:name=".widgets.AppWidgetClassic"
             android:exported="false"
             android:label="@string/app_widget_classic_name">
             <intent-filter>
@@ -110,7 +110,7 @@
                 android:resource="@xml/app_widget_classic_info" />
         </receiver>
         <receiver
-            android:name="com.dkanada.gramophone.widgets.AppWidgetCard"
+            android:name=".widgets.AppWidgetCard"
             android:exported="false"
             android:label="@string/app_widget_card_name">
             <intent-filter>
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java
index 2722ad85..5843108d 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java
@@ -20,13 +20,11 @@ import com.dkanada.gramophone.adapter.base.MediaEntryViewHolder;
 import com.dkanada.gramophone.glide.CustomGlideRequest;
 import com.dkanada.gramophone.glide.CustomPaletteTarget;
 import com.dkanada.gramophone.helper.menu.SongsMenuHelper;
-import com.dkanada.gramophone.helper.sort.SortMethod;
 import com.dkanada.gramophone.interfaces.CabHolder;
 import com.dkanada.gramophone.model.Artist;
 import com.dkanada.gramophone.model.Song;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.util.NavigationUtil;
-import com.dkanada.gramophone.util.PreferenceUtil;
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java
index 6d9c6e3b..4b06c3f9 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java
@@ -16,7 +16,6 @@ import com.dkanada.gramophone.model.Song;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.util.NavigationUtil;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class PlaylistSongAdapter extends AbsOffsetSongAdapter {
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/ShuffleButtonSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/ShuffleButtonSongAdapter.java
index 6786c603..4bf1b998 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/song/ShuffleButtonSongAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/ShuffleButtonSongAdapter.java
@@ -13,7 +13,6 @@ import com.dkanada.gramophone.helper.MusicPlayerRemote;
 import com.dkanada.gramophone.interfaces.CabHolder;
 import com.dkanada.gramophone.model.Song;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class ShuffleButtonSongAdapter extends AbsOffsetSongAdapter {
diff --git a/app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteTranscoder.java b/app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteTranscoder.java
index 5f6c15e3..3fd38c71 100644
--- a/app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteTranscoder.java
+++ b/app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteTranscoder.java
@@ -29,6 +29,6 @@ public class BitmapPaletteTranscoder implements ResourceTranscoder<Bitmap, Bitma
 
     @Override
     public String getId() {
-        return "BitmapPaletteTranscoder.com.kabouzeid.gramophone.glide.palette";
+        return "BitmapPaletteTranscoder.com.dkanada.gramophone.glide.palette";
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dkanada/gramophone/model/Album.java b/app/src/main/java/com/dkanada/gramophone/model/Album.java
index 6ae1a631..eef51a4b 100644
--- a/app/src/main/java/com/dkanada/gramophone/model/Album.java
+++ b/app/src/main/java/com/dkanada/gramophone/model/Album.java
@@ -3,10 +3,7 @@ package com.dkanada.gramophone.model;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.dkanada.gramophone.App;
-
 import org.jellyfin.apiclient.model.dto.BaseItemDto;
-import org.jellyfin.apiclient.model.dto.ImageOptions;
 import org.jellyfin.apiclient.model.entities.ImageType;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/dkanada/gramophone/service/MediaButtonIntentReceiver.java b/app/src/main/java/com/dkanada/gramophone/service/MediaButtonIntentReceiver.java
index c3f82592..66807f72 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MediaButtonIntentReceiver.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MediaButtonIntentReceiver.java
@@ -17,7 +17,6 @@ import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
 import android.os.PowerManager;
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 b5e8debb..6de329fa 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
@@ -63,7 +63,7 @@ import java.util.List;
 import java.util.Random;
 
 public class MusicService extends Service implements SharedPreferences.OnSharedPreferenceChangeListener, Playback.PlaybackCallbacks {
-    public static final String PHONOGRAPH_PACKAGE_NAME = "com.kabouzeid.gramophone";
+    public static final String PHONOGRAPH_PACKAGE_NAME = "com.dkanada.gramophone";
     public static final String MUSIC_PACKAGE_NAME = "com.android.music";
 
     public static final String ACTION_TOGGLE_PAUSE = PHONOGRAPH_PACKAGE_NAME + ".togglepause";
@@ -212,7 +212,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
 
         mediaSession.setActive(true);
 
-        sendBroadcast(new Intent("com.kabouzeid.gramophone.PHONOGRAPH_MUSIC_SERVICE_CREATED"));
+        sendBroadcast(new Intent("com.dkanada.gramophone.PHONOGRAPH_MUSIC_SERVICE_CREATED"));
     }
 
     private AudioManager getAudioManager() {
@@ -348,7 +348,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
         PreferenceUtil.getInstance(this).unregisterOnSharedPreferenceChangedListener(this);
         wakeLock.release();
 
-        sendBroadcast(new Intent("com.kabouzeid.gramophone.PHONOGRAPH_MUSIC_SERVICE_DESTROYED"));
+        sendBroadcast(new Intent("com.dkanada.gramophone.PHONOGRAPH_MUSIC_SERVICE_DESTROYED"));
     }
 
     @Override
diff --git a/app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutLauncherActivity.java b/app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutLauncherActivity.java
index 2d83c449..7ee13d1b 100644
--- a/app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutLauncherActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutLauncherActivity.java
@@ -11,7 +11,7 @@ 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.kabouzeid.gramophone.shortcuts.ShortcutType";
+    public static final String KEY_SHORTCUT_TYPE = "com.dkanada.gramophone.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/shortcuttype/BaseShortcutType.java b/app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/BaseShortcutType.java
index 7f10afba..a09a85f5 100644
--- a/app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/BaseShortcutType.java
+++ b/app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/BaseShortcutType.java
@@ -12,7 +12,7 @@ import com.dkanada.gramophone.shortcuts.AppShortcutLauncherActivity;
 @TargetApi(Build.VERSION_CODES.N_MR1)
 public abstract class BaseShortcutType {
 
-    static final String ID_PREFIX = "com.kabouzeid.gramophone.shortcuts.id.";
+    static final String ID_PREFIX = "com.dkanada.gramophone.shortcuts.id.";
 
     Context context;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/PlaylistDetailActivity.java
index 7defe02d..18da565d 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/PlaylistDetailActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/PlaylistDetailActivity.java
@@ -19,7 +19,6 @@ import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils;
 import com.kabouzeid.appthemehelper.ThemeStore;
 import com.dkanada.gramophone.R;
 import com.dkanada.gramophone.adapter.song.OrderablePlaylistSongAdapter;
-import com.dkanada.gramophone.adapter.song.PlaylistSongAdapter;
 import com.dkanada.gramophone.adapter.song.SongAdapter;
 import com.dkanada.gramophone.helper.MusicPlayerRemote;
 import com.dkanada.gramophone.helper.menu.PlaylistMenuHelper;
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/ui/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java
index 4e51ccbb..f1501c3c 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java
@@ -1,7 +1,6 @@
 package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
 
 import android.os.Bundle;
-import androidx.loader.app.LoaderManager;
 
 import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
 import com.dkanada.gramophone.ui.fragments.mainactivity.library.LibraryFragment;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java
index eb20566f..ee67e7c5 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java
@@ -2,11 +2,9 @@ package com.dkanada.gramophone.ui.fragments.player.card;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
-import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.annotation.ColorInt;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
index 03bc4a08..c07425ac 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
@@ -2,11 +2,9 @@ package com.dkanada.gramophone.ui.fragments.player.flat;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
-import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java b/app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java
index d267de83..702484e4 100644
--- a/app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java
+++ b/app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java
@@ -14,7 +14,6 @@ import com.dkanada.gramophone.R;
 import com.dkanada.gramophone.model.Album;
 import com.dkanada.gramophone.model.Artist;
 import com.dkanada.gramophone.model.Genre;
-import com.dkanada.gramophone.model.Playlist;
 import com.dkanada.gramophone.model.Song;
 
 import org.jellyfin.apiclient.interaction.Response;
diff --git a/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java b/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
index 86137f3a..7ec98ed3 100644
--- a/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
+++ b/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
@@ -11,7 +11,6 @@ import com.dkanada.gramophone.model.Album;
 import com.dkanada.gramophone.model.Artist;
 import com.dkanada.gramophone.model.Genre;
 import com.dkanada.gramophone.model.Playlist;
-import com.dkanada.gramophone.model.Song;
 import com.dkanada.gramophone.ui.activities.AlbumDetailActivity;
 import com.dkanada.gramophone.ui.activities.ArtistDetailActivity;
 import com.dkanada.gramophone.ui.activities.GenreDetailActivity;