diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4d17e86d..715c3ea7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,14 +22,14 @@
         android:theme="@style/Theme.Phonograph.Light"
         tools:ignore="UnusedAttribute">
         <activity
-            android:name=".ui.activities.MainActivity"
+            android:name=".activities.MainActivity"
             android:launchMode="singleTop" />
-        <activity android:name=".ui.activities.details.AlbumDetailActivity" />
-        <activity android:name=".ui.activities.details.ArtistDetailActivity" />
-        <activity android:name=".ui.activities.details.GenreDetailActivity" />
-        <activity android:name=".ui.activities.details.PlaylistDetailActivity" />
-        <activity android:name=".ui.activities.SearchActivity" />
-        <activity android:name=".ui.activities.SplashActivity">
+        <activity android:name=".activities.details.AlbumDetailActivity" />
+        <activity android:name=".activities.details.ArtistDetailActivity" />
+        <activity android:name=".activities.details.GenreDetailActivity" />
+        <activity android:name=".activities.details.PlaylistDetailActivity" />
+        <activity android:name=".activities.SearchActivity" />
+        <activity android:name=".activities.SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MUSIC_PLAYER" />
@@ -48,13 +48,13 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.activities.SettingsActivity"
+            android:name=".activities.SettingsActivity"
             android:label="@string/action_settings" />
         <activity
-            android:name=".ui.activities.AboutActivity"
+            android:name=".activities.AboutActivity"
             android:label="@string/action_about" />
         <activity
-            android:name=".ui.activities.LoginActivity"
+            android:name=".activities.LoginActivity"
             android:label="@string/action_login"
             android:theme="@style/LoginScreen" />
         <activity
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/AboutActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/AboutActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java
index ab549bdf..05e84da0 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/AboutActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities;
+package com.dkanada.gramophone.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -17,7 +17,7 @@ import com.dkanada.gramophone.databinding.CardAuthorBinding;
 import com.dkanada.gramophone.databinding.CardSpecialThanksBinding;
 import com.dkanada.gramophone.databinding.CardSupportDevelopmentBinding;
 import com.dkanada.gramophone.R;
-import com.dkanada.gramophone.ui.activities.base.AbsBaseActivity;
+import com.dkanada.gramophone.activities.base.AbsBaseActivity;
 
 @SuppressWarnings("FieldCanBeLocal")
 public class AboutActivity extends AbsBaseActivity implements View.OnClickListener {
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java
similarity index 97%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java
index 41f0e16f..a135af19 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities;
+package com.dkanada.gramophone.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,7 +13,7 @@ import androidx.annotation.NonNull;
 import com.dkanada.gramophone.App;
 import com.dkanada.gramophone.R;
 import com.dkanada.gramophone.databinding.ActivityLoginBinding;
-import com.dkanada.gramophone.ui.activities.base.AbsBaseActivity;
+import com.dkanada.gramophone.activities.base.AbsBaseActivity;
 import com.dkanada.gramophone.util.PreferenceUtil;
 import com.kabouzeid.appthemehelper.ThemeStore;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java
index 646cfa67..8a07a1ea 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities;
+package com.dkanada.gramophone.activities;
 
 import android.content.Intent;
 import android.os.Build;
@@ -25,7 +25,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.ui.activities.base.AbsSlidingMusicPanelActivity;
+import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
 import com.dkanada.gramophone.ui.fragments.mainactivity.library.LibraryFragment;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.util.QueryUtil;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/SearchActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/SearchActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java
index 96106877..e7895975 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/SearchActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities;
+package com.dkanada.gramophone.activities;
 
 import android.os.Bundle;
 import android.os.Handler;
@@ -18,7 +18,7 @@ import com.dkanada.gramophone.interfaces.MediaCallback;
 import com.dkanada.gramophone.model.Album;
 import com.dkanada.gramophone.model.Artist;
 import com.dkanada.gramophone.model.Song;
-import com.dkanada.gramophone.ui.activities.base.AbsMusicServiceActivity;
+import com.dkanada.gramophone.activities.base.AbsMusicServiceActivity;
 import com.dkanada.gramophone.util.QueryUtil;
 import com.dkanada.gramophone.util.Util;
 import com.kabouzeid.appthemehelper.ThemeStore;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
similarity index 99%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
index c1ed2a3c..e9f46d1b 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities;
+package com.dkanada.gramophone.activities;
 
 import android.content.SharedPreferences;
 import android.os.Build;
@@ -29,7 +29,7 @@ import com.dkanada.gramophone.preferences.CategoryPreference;
 import com.dkanada.gramophone.preferences.CategoryPreferenceDialog;
 import com.dkanada.gramophone.preferences.NowPlayingScreenPreference;
 import com.dkanada.gramophone.preferences.NowPlayingScreenPreferenceDialog;
-import com.dkanada.gramophone.ui.activities.base.AbsBaseActivity;
+import com.dkanada.gramophone.activities.base.AbsBaseActivity;
 import com.dkanada.gramophone.util.PreferenceUtil;
 
 public class SettingsActivity extends AbsBaseActivity implements ColorChooserDialog.ColorCallback {
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/SplashActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
similarity index 97%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/SplashActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
index bbb545a6..079bc54e 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/SplashActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities;
+package com.dkanada.gramophone.activities;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -12,7 +12,7 @@ import androidx.annotation.RequiresApi;
 
 import com.dkanada.gramophone.App;
 import com.dkanada.gramophone.R;
-import com.dkanada.gramophone.ui.activities.base.AbsBaseActivity;
+import com.dkanada.gramophone.activities.base.AbsBaseActivity;
 import com.dkanada.gramophone.util.PreferenceUtil;
 
 import org.jellyfin.apiclient.interaction.EmptyResponse;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java
similarity index 99%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java
index 935fee2f..85ff401c 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities.base;
+package com.dkanada.gramophone.activities.base;
 
 import android.Manifest;
 import android.content.Intent;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsMusicServiceActivity.java
similarity index 99%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/base/AbsMusicServiceActivity.java
index 5b0a3bba..73bad59f 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsMusicServiceActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities.base;
+package com.dkanada.gramophone.activities.base;
 
 import android.Manifest;
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
index 9a555a06..fa05b232 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities.base;
+package com.dkanada.gramophone.activities.base;
 
 import android.animation.ValueAnimator;
 import android.content.Intent;
@@ -18,7 +18,7 @@ import com.dkanada.gramophone.App;
 import com.dkanada.gramophone.R;
 import com.dkanada.gramophone.databinding.SlidingMusicPanelLayoutBinding;
 import com.dkanada.gramophone.helper.MusicPlayerRemote;
-import com.dkanada.gramophone.ui.activities.SplashActivity;
+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;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java
index fa0b8cb2..ae7c44f9 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities.base;
+package com.dkanada.gramophone.activities.base;
 
 import android.os.Build;
 import android.os.Bundle;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/AlbumDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/details/AlbumDetailActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java
index 504a9646..44aba7f5 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/AlbumDetailActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities.details;
+package com.dkanada.gramophone.activities.details;
 
 import android.graphics.PorterDuff;
 import android.os.Bundle;
@@ -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.ui.activities.base.AbsSlidingMusicPanelActivity;
+import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.util.NavigationUtil;
 import com.dkanada.gramophone.util.ThemeUtil;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/ArtistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/details/ArtistDetailActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java
index 39d8574f..97aa428c 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/ArtistDetailActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities.details;
+package com.dkanada.gramophone.activities.details;
 
 import android.graphics.PorterDuff;
 import android.os.Bundle;
@@ -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.ui.activities.base.AbsSlidingMusicPanelActivity;
+import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
 import com.dkanada.gramophone.util.MusicUtil;
 import com.dkanada.gramophone.util.ThemeUtil;
 import com.dkanada.gramophone.util.PreferenceUtil;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/GenreDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java
similarity index 97%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/details/GenreDetailActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java
index 34246d8a..ec4c3c39 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/GenreDetailActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities.details;
+package com.dkanada.gramophone.activities.details;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -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.ui.activities.base.AbsSlidingMusicPanelActivity;
+import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
 import com.dkanada.gramophone.util.ThemeUtil;
 import com.dkanada.gramophone.util.QueryUtil;
 import com.dkanada.gramophone.util.ViewUtil;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/PlaylistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/ui/activities/details/PlaylistDetailActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java
index ea75686d..d4831e76 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/PlaylistDetailActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.ui.activities.details;
+package com.dkanada.gramophone.activities.details;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -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.ui.activities.base.AbsSlidingMusicPanelActivity;
+import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
 import com.dkanada.gramophone.util.ThemeUtil;
 import com.dkanada.gramophone.util.PlaylistUtil;
 import com.dkanada.gramophone.util.ViewUtil;
diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java
index ecd39ed9..ca532c77 100644
--- a/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java
@@ -10,7 +10,7 @@ import androidx.fragment.app.DialogFragment;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.dkanada.gramophone.App;
 import com.dkanada.gramophone.R;
-import com.dkanada.gramophone.ui.activities.LoginActivity;
+import com.dkanada.gramophone.activities.LoginActivity;
 
 import org.jellyfin.apiclient.interaction.EmptyResponse;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java
index aad845c9..0675741a 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java
@@ -27,7 +27,7 @@ import com.dkanada.gramophone.glide.CustomGlideRequest;
 import com.dkanada.gramophone.glide.palette.BitmapPaletteWrapper;
 import com.dkanada.gramophone.model.Song;
 import com.dkanada.gramophone.service.MusicService;
-import com.dkanada.gramophone.ui.activities.MainActivity;
+import com.dkanada.gramophone.activities.MainActivity;
 import com.dkanada.gramophone.util.ImageUtil;
 import com.dkanada.gramophone.util.ThemeUtil;
 import com.dkanada.gramophone.util.PreferenceUtil;
diff --git a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java
index 8c94bbb3..01d09547 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java
@@ -21,7 +21,7 @@ import com.dkanada.gramophone.glide.CustomGlideRequest;
 import com.dkanada.gramophone.glide.palette.BitmapPaletteWrapper;
 import com.dkanada.gramophone.model.Song;
 import com.dkanada.gramophone.service.MusicService;
-import com.dkanada.gramophone.ui.activities.MainActivity;
+import com.dkanada.gramophone.activities.MainActivity;
 import com.dkanada.gramophone.util.PreferenceUtil;
 
 import static com.dkanada.gramophone.service.MusicService.ACTION_REWIND;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java
index f1095b29..512ab2b7 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java
@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
 import com.dkanada.gramophone.interfaces.MusicServiceEventListener;
-import com.dkanada.gramophone.ui.activities.base.AbsMusicServiceActivity;
+import com.dkanada.gramophone.activities.base.AbsMusicServiceActivity;
 
 public class AbsMusicServiceFragment extends Fragment implements MusicServiceEventListener {
     private AbsMusicServiceActivity activity;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java
index 358f98c3..97447f9d 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java
@@ -4,7 +4,7 @@ import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
 
-import com.dkanada.gramophone.ui.activities.MainActivity;
+import com.dkanada.gramophone.activities.MainActivity;
 
 public abstract class AbsMainActivityFragment extends Fragment {
     public MainActivity getMainActivity() {
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
index 901f5d01..d9624cf9 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
@@ -31,8 +31,8 @@ import com.dkanada.gramophone.dialogs.CreatePlaylistDialog;
 import com.dkanada.gramophone.helper.sort.SortMethod;
 import com.dkanada.gramophone.helper.sort.SortOrder;
 import com.dkanada.gramophone.interfaces.CabHolder;
-import com.dkanada.gramophone.ui.activities.MainActivity;
-import com.dkanada.gramophone.ui.activities.SearchActivity;
+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;
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 018e00c8..bbe4cbc2 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
@@ -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.ui.activities.base.AbsSlidingMusicPanelActivity;
+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.util.ImageUtil;
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 8f9579e0..9e045dd1 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
@@ -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.ui.activities.base.AbsSlidingMusicPanelActivity;
+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.util.ImageUtil;
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 73931407..ddd116b7 100644
--- a/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
+++ b/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
@@ -12,10 +12,10 @@ 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.ui.activities.details.AlbumDetailActivity;
-import com.dkanada.gramophone.ui.activities.details.ArtistDetailActivity;
-import com.dkanada.gramophone.ui.activities.details.GenreDetailActivity;
-import com.dkanada.gramophone.ui.activities.details.PlaylistDetailActivity;
+import com.dkanada.gramophone.activities.details.AlbumDetailActivity;
+import com.dkanada.gramophone.activities.details.ArtistDetailActivity;
+import com.dkanada.gramophone.activities.details.GenreDetailActivity;
+import com.dkanada.gramophone.activities.details.PlaylistDetailActivity;
 
 public class NavigationUtil {
 
diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java
index ff92013e..f045cb10 100644
--- a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java
+++ b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java
@@ -23,7 +23,7 @@ import com.dkanada.gramophone.R;
 import com.dkanada.gramophone.glide.CustomGlideRequest;
 import com.dkanada.gramophone.model.Song;
 import com.dkanada.gramophone.service.MusicService;
-import com.dkanada.gramophone.ui.activities.MainActivity;
+import com.dkanada.gramophone.activities.MainActivity;
 import com.dkanada.gramophone.util.ImageUtil;
 import com.dkanada.gramophone.util.Util;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java
index 7cc6a676..398fda04 100644
--- a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java
+++ b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java
@@ -24,7 +24,7 @@ import com.dkanada.gramophone.glide.CustomGlideRequest;
 import com.dkanada.gramophone.glide.palette.BitmapPaletteWrapper;
 import com.dkanada.gramophone.model.Song;
 import com.dkanada.gramophone.service.MusicService;
-import com.dkanada.gramophone.ui.activities.MainActivity;
+import com.dkanada.gramophone.activities.MainActivity;
 import com.dkanada.gramophone.util.ImageUtil;
 
 public class AppWidgetCard extends BaseAppWidget {
diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java
index 707f2333..60c5b7cd 100644
--- a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java
+++ b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java
@@ -24,7 +24,7 @@ import com.dkanada.gramophone.glide.CustomGlideRequest;
 import com.dkanada.gramophone.glide.palette.BitmapPaletteWrapper;
 import com.dkanada.gramophone.model.Song;
 import com.dkanada.gramophone.service.MusicService;
-import com.dkanada.gramophone.ui.activities.MainActivity;
+import com.dkanada.gramophone.activities.MainActivity;
 import com.dkanada.gramophone.util.ImageUtil;
 
 public class AppWidgetClassic extends BaseAppWidget {
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index e2280c6b..2171497f 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".ui.activities.AboutActivity">
+    tools:context=".activities.AboutActivity">
 
     <include layout="@layout/status_bar" />
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 7c36fe4a..0188e885 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".ui.activities.LoginActivity">
+    tools:context=".activities.LoginActivity">
 
     <include layout="@layout/status_bar"
         android:id="@+id/status_bar"
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 894b2b1c..04de21fa 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".ui.activities.SplashActivity">
+    tools:context=".activities.SplashActivity">
 
     <ProgressBar
         android:layout_width="wrap_content"