diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
index 132ee9d46..ef72faf49 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
@@ -22,9 +22,9 @@ import com.fongmi.android.tv.bean.Site;
 import com.fongmi.android.tv.databinding.ActivitySettingBinding;
 import com.fongmi.android.tv.event.RefreshEvent;
 import com.fongmi.android.tv.net.Callback;
-import com.fongmi.android.tv.ui.custom.ConfigDialog;
-import com.fongmi.android.tv.ui.custom.ConfigHistoryDialog;
-import com.fongmi.android.tv.ui.custom.SiteDialog;
+import com.fongmi.android.tv.ui.custom.dialog.ConfigDialog;
+import com.fongmi.android.tv.ui.custom.dialog.HistoryDialog;
+import com.fongmi.android.tv.ui.custom.dialog.SiteDialog;
 import com.fongmi.android.tv.utils.Notify;
 import com.fongmi.android.tv.utils.Prefers;
 import com.fongmi.android.tv.utils.ResUtil;
@@ -56,7 +56,7 @@ public class SettingActivity extends BaseActivity implements SettingCallback {
     protected void initEvent() {
         mBinding.site.setOnClickListener(view -> SiteDialog.show(this));
         mBinding.config.setOnClickListener(view -> ConfigDialog.show(this));
-        mBinding.history.setOnClickListener(view -> ConfigHistoryDialog.show(this));
+        mBinding.history.setOnClickListener(view -> HistoryDialog.show(this));
         mBinding.thumbnail.setOnClickListener(this::setThumbnail);
     }
 
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/ConfigAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/ConfigAdapter.java
index 8f1cb5979..d6ffc549b 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/ConfigAdapter.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/ConfigAdapter.java
@@ -58,7 +58,7 @@ public class ConfigAdapter extends RecyclerView.Adapter<ConfigAdapter.ViewHolder
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        Config item = (Config) mItems.get(position);
+        Config item = mItems.get(position);
         holder.binding.text.setText(item.getUrl());
         holder.binding.text.setOnClickListener(v -> mListener.onTextClick(item));
         holder.binding.delete.setOnClickListener(v -> mListener.onDeleteClick(item));
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/KeyDown.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDown.java
similarity index 91%
rename from app/src/main/java/com/fongmi/android/tv/utils/KeyDown.java
rename to app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDown.java
index 9714d97e1..9ad2569d8 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/KeyDown.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDown.java
@@ -1,17 +1,17 @@
-package com.fongmi.android.tv.utils;
+package com.fongmi.android.tv.ui.custom;
 
 import android.view.KeyEvent;
 
-public class KeyDown {
+public class CustomKeyDown {
 
     private final Listener mListener;
     private int mHoldTime;
 
-    public static KeyDown create(Listener listener) {
-        return new KeyDown(listener);
+    public static CustomKeyDown create(Listener listener) {
+        return new CustomKeyDown(listener);
     }
 
-    private KeyDown(Listener listener) {
+    private CustomKeyDown(Listener listener) {
         this.mListener = listener;
     }
 
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/ConfigDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java
similarity index 98%
rename from app/src/leanback/java/com/fongmi/android/tv/ui/custom/ConfigDialog.java
rename to app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java
index ad04fd0d9..05c13fd30 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/ConfigDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java
@@ -1,4 +1,4 @@
-package com.fongmi.android.tv.ui.custom;
+package com.fongmi.android.tv.ui.custom.dialog;
 
 import android.app.Activity;
 import android.content.DialogInterface;
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/ConfigHistoryDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/HistoryDialog.java
similarity index 81%
rename from app/src/leanback/java/com/fongmi/android/tv/ui/custom/ConfigHistoryDialog.java
rename to app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/HistoryDialog.java
index f3fd86a1a..a95a016cb 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/ConfigHistoryDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/HistoryDialog.java
@@ -1,4 +1,4 @@
-package com.fongmi.android.tv.ui.custom;
+package com.fongmi.android.tv.ui.custom.dialog;
 
 import android.app.Activity;
 import android.view.LayoutInflater;
@@ -9,25 +9,25 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.fongmi.android.tv.SettingCallback;
 import com.fongmi.android.tv.bean.Config;
-import com.fongmi.android.tv.databinding.DialogConfigHistoryBinding;
+import com.fongmi.android.tv.databinding.DialogHistoryBinding;
 import com.fongmi.android.tv.ui.adapter.ConfigAdapter;
 import com.fongmi.android.tv.utils.ResUtil;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
-public class ConfigHistoryDialog implements ConfigAdapter.OnClickListener {
+public class HistoryDialog implements ConfigAdapter.OnClickListener {
 
-    private DialogConfigHistoryBinding binding;
+    private DialogHistoryBinding binding;
     private SettingCallback callback;
     private ConfigAdapter adapter;
     private AlertDialog dialog;
 
     public static void show(Activity activity) {
-        new ConfigHistoryDialog().create(activity);
+        new HistoryDialog().create(activity);
     }
 
     public void create(Activity activity) {
         callback = (SettingCallback) activity;
-        binding = DialogConfigHistoryBinding.inflate(LayoutInflater.from(activity));
+        binding = DialogHistoryBinding.inflate(LayoutInflater.from(activity));
         dialog = new MaterialAlertDialogBuilder(activity).setView(binding.getRoot()).create();
         setRecyclerView();
         setDialog();
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/SiteDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java
similarity index 98%
rename from app/src/leanback/java/com/fongmi/android/tv/ui/custom/SiteDialog.java
rename to app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java
index a852dbf68..d3db6d61f 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/SiteDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java
@@ -1,4 +1,4 @@
-package com.fongmi.android.tv.ui.custom;
+package com.fongmi.android.tv.ui.custom.dialog;
 
 import android.app.Activity;
 import android.view.LayoutInflater;
diff --git a/app/src/leanback/res/layout/dialog_config_history.xml b/app/src/leanback/res/layout/dialog_history.xml
similarity index 100%
rename from app/src/leanback/res/layout/dialog_config_history.xml
rename to app/src/leanback/res/layout/dialog_history.xml