diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d3f5919..5796d29 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
         android:hardwareAccelerated="true"
         tools:targetApi="31">
         <activity
-            android:name=".HomeActivity"
+            android:name=".Ui.HomeActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -30,16 +30,16 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".DetailActivity"
+            android:name=".Ui.DetailActivity"
             android:exported="false" />
         <activity
-            android:name=".CollectionActivity"
+            android:name=".Ui.CollectionActivity"
             android:exported="false" />
         <activity
-            android:name=".SearchActivity"
+            android:name=".Ui.SearchActivity"
             android:exported="false" />
         <activity
-            android:name=".VlcPlayerActivity"
+            android:name=".Player.VlcPlayerActivity"
             android:exported="false"
             android:theme="@style/Theme.AppCompat.NoActionBar"/>
 
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/JAdapter.java b/app/src/main/java/org/sifacai/vlcjellyfin/Component/JAdapter.java
similarity index 93%
rename from app/src/main/java/org/sifacai/vlcjellyfin/JAdapter.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Component/JAdapter.java
index 7249c39..ab695c9 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/JAdapter.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Component/JAdapter.java
@@ -1,7 +1,6 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Component;
 
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,14 +11,11 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.owen.tvrecyclerview.widget.TvRecyclerView;
 import com.squareup.picasso.Picasso;
 
 import org.sifacai.vlcjellyfin.Bean.Item;
-import org.sifacai.vlcjellyfin.Bean.Items;
-import org.sifacai.vlcjellyfin.Bean.People;
+import org.sifacai.vlcjellyfin.Utils.JfClient;
+import org.sifacai.vlcjellyfin.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/JRecyclerView.java b/app/src/main/java/org/sifacai/vlcjellyfin/Component/JRecyclerView.java
similarity index 96%
rename from app/src/main/java/org/sifacai/vlcjellyfin/JRecyclerView.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Component/JRecyclerView.java
index 2ccd9db..3c6beb2 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/JRecyclerView.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Component/JRecyclerView.java
@@ -1,4 +1,4 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Component;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/PopMenu.java b/app/src/main/java/org/sifacai/vlcjellyfin/Player/PopMenu.java
similarity index 97%
rename from app/src/main/java/org/sifacai/vlcjellyfin/PopMenu.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Player/PopMenu.java
index 4b74cf4..e1a0d7b 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/PopMenu.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Player/PopMenu.java
@@ -1,4 +1,4 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Player;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -12,6 +12,8 @@ import android.widget.PopupWindow;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import org.sifacai.vlcjellyfin.R;
+
 import java.util.ArrayList;
 
 public class PopMenu extends PopupWindow {
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/Video.java b/app/src/main/java/org/sifacai/vlcjellyfin/Player/Video.java
similarity index 85%
rename from app/src/main/java/org/sifacai/vlcjellyfin/Video.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Player/Video.java
index c7ab616..9b45e70 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/Video.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Player/Video.java
@@ -1,4 +1,4 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Player;
 
 import android.net.Uri;
 
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/VlcPlayerActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/Player/VlcPlayerActivity.java
similarity index 99%
rename from app/src/main/java/org/sifacai/vlcjellyfin/VlcPlayerActivity.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Player/VlcPlayerActivity.java
index e8f90ba..ed45c3e 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/VlcPlayerActivity.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Player/VlcPlayerActivity.java
@@ -1,4 +1,4 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Player;
 
 import android.app.Activity;
 import android.net.Uri;
@@ -15,7 +15,9 @@ import android.widget.ProgressBar;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import org.videolan.libvlc.Dialog;
+import org.sifacai.vlcjellyfin.Utils.JfClient;
+import org.sifacai.vlcjellyfin.R;
+import org.sifacai.vlcjellyfin.Ui.BaseActivity;
 import org.videolan.libvlc.LibVLC;
 import org.videolan.libvlc.Media;
 import org.videolan.libvlc.MediaPlayer;
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/BaseActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/BaseActivity.java
similarity index 98%
rename from app/src/main/java/org/sifacai/vlcjellyfin/BaseActivity.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Ui/BaseActivity.java
index a8f8a8b..69ffe17 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/BaseActivity.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/BaseActivity.java
@@ -1,6 +1,5 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Ui;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -12,12 +11,15 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
+
+import org.sifacai.vlcjellyfin.Utils.JfClient;
+import org.sifacai.vlcjellyfin.R;
+
 import me.jessyan.autosize.internal.CustomAdapt;
 
 public class BaseActivity extends AppCompatActivity implements CustomAdapt {
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/CollectionActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/CollectionActivity.java
similarity index 95%
rename from app/src/main/java/org/sifacai/vlcjellyfin/CollectionActivity.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Ui/CollectionActivity.java
index 7ae68b3..55ca84e 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/CollectionActivity.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/CollectionActivity.java
@@ -1,29 +1,22 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Ui;
 
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.SubMenu;
 import android.view.View;
 import android.widget.PopupMenu;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 import com.owen.tvrecyclerview.widget.TvRecyclerView;
 import com.owen.tvrecyclerview.widget.V7GridLayoutManager;
 
 import org.sifacai.vlcjellyfin.Bean.Item;
 import org.sifacai.vlcjellyfin.Bean.Items;
+import org.sifacai.vlcjellyfin.Utils.Config;
+import org.sifacai.vlcjellyfin.Component.JAdapter;
+import org.sifacai.vlcjellyfin.Utils.JfClient;
+import org.sifacai.vlcjellyfin.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/DetailActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/DetailActivity.java
similarity index 96%
rename from app/src/main/java/org/sifacai/vlcjellyfin/DetailActivity.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Ui/DetailActivity.java
index c93b05d..4f7072b 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/DetailActivity.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/DetailActivity.java
@@ -1,27 +1,14 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Ui;
 
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.app.Activity;
 import android.content.Intent;
-import android.content.UriMatcher;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.Html;
-import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
-import android.view.animation.BounceInterpolator;
-import android.webkit.MimeTypeMap;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 import com.owen.tvrecyclerview.widget.V7GridLayoutManager;
 import com.owen.tvrecyclerview.widget.V7LinearLayoutManager;
 import com.squareup.picasso.Picasso;
@@ -32,9 +19,15 @@ import org.sifacai.vlcjellyfin.Bean.Items;
 import org.sifacai.vlcjellyfin.Bean.MediaStreams;
 import org.sifacai.vlcjellyfin.Bean.People;
 import org.sifacai.vlcjellyfin.Bean.UserData;
+import org.sifacai.vlcjellyfin.Component.JAdapter;
+import org.sifacai.vlcjellyfin.Component.JRecyclerView;
+import org.sifacai.vlcjellyfin.Utils.JfClient;
+import org.sifacai.vlcjellyfin.R;
+import org.sifacai.vlcjellyfin.Utils.Utils;
+import org.sifacai.vlcjellyfin.Player.Video;
+import org.sifacai.vlcjellyfin.Player.VlcPlayerActivity;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 public class DetailActivity extends BaseActivity implements JAdapter.OnItemClickListener {
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/HomeActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/HomeActivity.java
similarity index 97%
rename from app/src/main/java/org/sifacai/vlcjellyfin/HomeActivity.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Ui/HomeActivity.java
index acc1bd9..d5e1c29 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/HomeActivity.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/HomeActivity.java
@@ -1,4 +1,4 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Ui;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -15,12 +15,14 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 import com.owen.tvrecyclerview.widget.V7LinearLayoutManager;
 
 import org.sifacai.vlcjellyfin.Bean.Item;
 import org.sifacai.vlcjellyfin.Bean.Items;
+import org.sifacai.vlcjellyfin.Component.JAdapter;
+import org.sifacai.vlcjellyfin.Component.JRecyclerView;
+import org.sifacai.vlcjellyfin.Utils.JfClient;
+import org.sifacai.vlcjellyfin.R;
 
 import java.util.List;
 
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/SearchActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/SearchActivity.java
similarity index 95%
rename from app/src/main/java/org/sifacai/vlcjellyfin/SearchActivity.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Ui/SearchActivity.java
index f59a4ef..880e533 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/SearchActivity.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/SearchActivity.java
@@ -1,9 +1,7 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Ui;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.telecom.Call;
-import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -11,13 +9,14 @@ import android.widget.ImageView;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 import com.owen.tvrecyclerview.widget.TvRecyclerView;
 import com.owen.tvrecyclerview.widget.V7GridLayoutManager;
 
 import org.sifacai.vlcjellyfin.Bean.Item;
 import org.sifacai.vlcjellyfin.Bean.Items;
+import org.sifacai.vlcjellyfin.Component.JAdapter;
+import org.sifacai.vlcjellyfin.Utils.JfClient;
+import org.sifacai.vlcjellyfin.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/Config.java b/app/src/main/java/org/sifacai/vlcjellyfin/Utils/Config.java
similarity index 99%
rename from app/src/main/java/org/sifacai/vlcjellyfin/Config.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Utils/Config.java
index 96da8f6..c88a8ae 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/Config.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Utils/Config.java
@@ -1,4 +1,4 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java b/app/src/main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java
similarity index 99%
rename from app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java
index c53fa82..3313e5d 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java
@@ -1,7 +1,6 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Utils;
 
 import android.app.Application;
-import android.util.Log;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -16,6 +15,9 @@ import com.squareup.picasso.Picasso;
 
 import org.sifacai.vlcjellyfin.Bean.Item;
 import org.sifacai.vlcjellyfin.Bean.Items;
+import org.sifacai.vlcjellyfin.Player.Video;
+import org.sifacai.vlcjellyfin.Utils.Config;
+import org.sifacai.vlcjellyfin.Utils.Utils;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/Utils.java b/app/src/main/java/org/sifacai/vlcjellyfin/Utils/Utils.java
similarity index 98%
rename from app/src/main/java/org/sifacai/vlcjellyfin/Utils.java
rename to app/src/main/java/org/sifacai/vlcjellyfin/Utils/Utils.java
index 8b5b035..9e58b90 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/Utils.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/Utils/Utils.java
@@ -1,4 +1,4 @@
-package org.sifacai.vlcjellyfin;
+package org.sifacai.vlcjellyfin.Utils;
 
 import android.app.Activity;
 import android.util.DisplayMetrics;
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/application.java b/app/src/main/java/org/sifacai/vlcjellyfin/application.java
index fc06c9f..50fa9ac 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/application.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/application.java
@@ -5,6 +5,8 @@ import android.content.Context;
 
 import androidx.multidex.MultiDex;
 
+import org.sifacai.vlcjellyfin.Utils.JfClient;
+
 public class application extends Application {
     @Override
     public void onCreate() {
diff --git a/app/src/main/res/layout/activity_collection.xml b/app/src/main/res/layout/activity_collection.xml
index 600bb53..0d9dcbc 100644
--- a/app/src/main/res/layout/activity_collection.xml
+++ b/app/src/main/res/layout/activity_collection.xml
@@ -5,9 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".CollectionActivity">
+    tools:context=".Ui.CollectionActivity">
 
-    <org.sifacai.vlcjellyfin.JRecyclerView
+    <org.sifacai.vlcjellyfin.Component.JRecyclerView
         android:id="@+id/mGridView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
index 6d84749..6091670 100644
--- a/app/src/main/res/layout/activity_detail.xml
+++ b/app/src/main/res/layout/activity_detail.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/padding_border"
-    tools:context=".DetailActivity">
+    tools:context=".Ui.DetailActivity">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -74,7 +74,7 @@
                         android:src="@drawable/ic_outline_play_circle_outline_128"
                         android:visibility="gone" />
 
-                    <org.sifacai.vlcjellyfin.JRecyclerView
+                    <org.sifacai.vlcjellyfin.Component.JRecyclerView
                         android:id="@+id/mGridView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -105,7 +105,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"/>
 
-                <org.sifacai.vlcjellyfin.JRecyclerView
+                <org.sifacai.vlcjellyfin.Component.JRecyclerView
                     android:id="@+id/mPersonGridView"
                     android:layout_width="match_parent"
                     android:layout_height="312dp"
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 3b700fd..9846c0d 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -35,7 +35,7 @@
 
     </LinearLayout>
 
-    <org.sifacai.vlcjellyfin.JRecyclerView
+    <org.sifacai.vlcjellyfin.Component.JRecyclerView
         android:id="@+id/mGridView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_vlc_player.xml b/app/src/main/res/layout/activity_vlc_player.xml
index 047dabd..ea93044 100644
--- a/app/src/main/res/layout/activity_vlc_player.xml
+++ b/app/src/main/res/layout/activity_vlc_player.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".VlcPlayerActivity">
+    tools:context=".Player.VlcPlayerActivity">
 
     <org.videolan.libvlc.util.VLCVideoLayout
         android:id="@+id/VideoView"
diff --git a/app/src/main/res/layout/home_horizon_tvrecycler.xml b/app/src/main/res/layout/home_horizon_tvrecycler.xml
index 161bae3..1e4f597 100644
--- a/app/src/main/res/layout/home_horizon_tvrecycler.xml
+++ b/app/src/main/res/layout/home_horizon_tvrecycler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.sifacai.vlcjellyfin.JRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.sifacai.vlcjellyfin.Component.JRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -11,4 +11,4 @@
     app:tv_horizontalSpacingWithMargins="10dp"
     app:tv_selectedItemIsCentered="true">
 
-</org.sifacai.vlcjellyfin.JRecyclerView>
\ No newline at end of file
+</org.sifacai.vlcjellyfin.Component.JRecyclerView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/jellyfin_home.xml b/app/src/main/res/layout/jellyfin_home.xml
index 360bb72..5e3bc79 100644
--- a/app/src/main/res/layout/jellyfin_home.xml
+++ b/app/src/main/res/layout/jellyfin_home.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".HomeActivity">
+    tools:context=".Ui.HomeActivity">
 
     <ScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"