diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6240991..43b9ffd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,10 +15,10 @@
         android:theme="@style/Theme.MusicApp"
         tools:targetApi="31">
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.activity.MainActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.HomeActivity"
+            android:name=".ui.activity.HomeActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/hi/music/player/adapter/HomeViewPagerAdapter.java b/app/src/main/java/com/hi/music/player/adapter/HomeViewPagerAdapter.java
index 4690ef1..acab625 100644
--- a/app/src/main/java/com/hi/music/player/adapter/HomeViewPagerAdapter.java
+++ b/app/src/main/java/com/hi/music/player/adapter/HomeViewPagerAdapter.java
@@ -5,9 +5,9 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
-import com.hi.music.player.ui.HomeFragment;
-import com.hi.music.player.ui.ProfileFragment;
-import com.hi.music.player.ui.SearchFragment;
+import com.hi.music.player.ui.fragmnt.HomeFragment;
+import com.hi.music.player.ui.fragmnt.ProfileFragment;
+import com.hi.music.player.ui.fragmnt.SearchFragment;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/hi/music/player/ui/BaseActivity.java b/app/src/main/java/com/hi/music/player/ui/activity/BaseActivity.java
similarity index 98%
rename from app/src/main/java/com/hi/music/player/ui/BaseActivity.java
rename to app/src/main/java/com/hi/music/player/ui/activity/BaseActivity.java
index 6787586..13cbf67 100644
--- a/app/src/main/java/com/hi/music/player/ui/BaseActivity.java
+++ b/app/src/main/java/com/hi/music/player/ui/activity/BaseActivity.java
@@ -1,4 +1,4 @@
-package com.hi.music.player.ui;
+package com.hi.music.player.ui.activity;
 
 import android.os.Bundle;
 import android.view.View;
diff --git a/app/src/main/java/com/hi/music/player/ui/HomeActivity.java b/app/src/main/java/com/hi/music/player/ui/activity/HomeActivity.java
similarity index 96%
rename from app/src/main/java/com/hi/music/player/ui/HomeActivity.java
rename to app/src/main/java/com/hi/music/player/ui/activity/HomeActivity.java
index 48b76b3..2767be6 100644
--- a/app/src/main/java/com/hi/music/player/ui/HomeActivity.java
+++ b/app/src/main/java/com/hi/music/player/ui/activity/HomeActivity.java
@@ -1,10 +1,7 @@
-package com.hi.music.player.ui;
+package com.hi.music.player.ui.activity;
 
-import android.os.Bundle;
 import android.view.LayoutInflater;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 import com.hi.music.player.R;
diff --git a/app/src/main/java/com/hi/music/player/ui/MainActivity.java b/app/src/main/java/com/hi/music/player/ui/activity/MainActivity.java
similarity index 95%
rename from app/src/main/java/com/hi/music/player/ui/MainActivity.java
rename to app/src/main/java/com/hi/music/player/ui/activity/MainActivity.java
index 891cc47..a367ef7 100644
--- a/app/src/main/java/com/hi/music/player/ui/MainActivity.java
+++ b/app/src/main/java/com/hi/music/player/ui/activity/MainActivity.java
@@ -1,10 +1,9 @@
-package com.hi.music.player.ui;
+package com.hi.music.player.ui.activity;
 
 import android.view.View;
 
 import com.hi.music.player.databinding.ActivityMainBinding;
 import com.hi.music.player.network.RetrofitManager;
-import com.hi.music.player.ui.BaseActivity;
 
 public class MainActivity extends BaseActivity<ActivityMainBinding> {
 
diff --git a/app/src/main/java/com/hi/music/player/ui/BaseFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/BaseFragment.java
similarity index 97%
rename from app/src/main/java/com/hi/music/player/ui/BaseFragment.java
rename to app/src/main/java/com/hi/music/player/ui/fragmnt/BaseFragment.java
index fc1bba7..5f2874f 100644
--- a/app/src/main/java/com/hi/music/player/ui/BaseFragment.java
+++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/BaseFragment.java
@@ -1,4 +1,4 @@
-package com.hi.music.player.ui;
+package com.hi.music.player.ui.fragmnt;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/app/src/main/java/com/hi/music/player/ui/HomeFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java
similarity index 93%
rename from app/src/main/java/com/hi/music/player/ui/HomeFragment.java
rename to app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java
index 440efd7..37c4b4b 100644
--- a/app/src/main/java/com/hi/music/player/ui/HomeFragment.java
+++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java
@@ -1,4 +1,4 @@
-package com.hi.music.player.ui;
+package com.hi.music.player.ui.fragmnt;
 
 import com.hi.music.player.R;
 import com.hi.music.player.databinding.FragmentHomeBinding;
diff --git a/app/src/main/java/com/hi/music/player/ui/ProfileFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/ProfileFragment.java
similarity index 60%
rename from app/src/main/java/com/hi/music/player/ui/ProfileFragment.java
rename to app/src/main/java/com/hi/music/player/ui/fragmnt/ProfileFragment.java
index c04551e..b99b884 100644
--- a/app/src/main/java/com/hi/music/player/ui/ProfileFragment.java
+++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/ProfileFragment.java
@@ -1,14 +1,5 @@
-package com.hi.music.player.ui;
+package com.hi.music.player.ui.fragmnt;
 
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.hi.music.player.R;
 import com.hi.music.player.databinding.FragmentProfileBinding;
 
 
diff --git a/app/src/main/java/com/hi/music/player/ui/SearchFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/SearchFragment.java
similarity index 60%
rename from app/src/main/java/com/hi/music/player/ui/SearchFragment.java
rename to app/src/main/java/com/hi/music/player/ui/fragmnt/SearchFragment.java
index 98876e1..eabcf1f 100644
--- a/app/src/main/java/com/hi/music/player/ui/SearchFragment.java
+++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/SearchFragment.java
@@ -1,14 +1,5 @@
-package com.hi.music.player.ui;
+package com.hi.music.player.ui.fragmnt;
 
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.hi.music.player.R;
 import com.hi.music.player.databinding.FragmentSearchBinding;
 
 
diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml
index d9642c5..2492721 100644
--- a/app/src/main/res/layout/activity_base.xml
+++ b/app/src/main/res/layout/activity_base.xml
@@ -4,6 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.BaseActivity">
+    tools:context=".ui.activity.BaseActivity">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index ba5cfbe..909108e 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/home_background"
-    tools:context=".ui.HomeActivity">
+    tools:context=".ui.activity.HomeActivity">
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/home_view_pager"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ae9e311..38cf85a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".ui.MainActivity">
+    tools:context=".ui.activity.MainActivity">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 7fd70bb..acd6fa9 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.HomeFragment">
+    tools:context=".ui.fragmnt.HomeFragment">
 
     <!-- 顶部应用栏 -->
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 7721eef..207fc02 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#1e2b28"
-    tools:context=".ui.ProfileFragment">
+    tools:context=".ui.fragmnt.ProfileFragment">
 
     <!-- 第一行: 左边文字，右边控件 -->
     <TextView
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 6e978de..d8bf0d1 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.SearchFragment">
+    tools:context=".ui.fragmnt.SearchFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView