diff --git a/app/schemas/com.hippo.network.CookiesDatabase/1.json b/app/schemas/com.hippo.ehviewer.network.CookiesDatabase/1.json
similarity index 100%
rename from app/schemas/com.hippo.network.CookiesDatabase/1.json
rename to app/schemas/com.hippo.ehviewer.network.CookiesDatabase/1.json
diff --git a/app/schemas/com.hippo.network.CookiesDatabase/2.json b/app/schemas/com.hippo.ehviewer.network.CookiesDatabase/2.json
similarity index 100%
rename from app/schemas/com.hippo.network.CookiesDatabase/2.json
rename to app/schemas/com.hippo.ehviewer.network.CookiesDatabase/2.json
diff --git a/app/src/main/java/com/hippo/ehviewer/AppConfig.java b/app/src/main/java/com/hippo/ehviewer/AppConfig.java
index c6eeb3130..b361f1eac 100644
--- a/app/src/main/java/com/hippo/ehviewer/AppConfig.java
+++ b/app/src/main/java/com/hippo/ehviewer/AppConfig.java
@@ -24,9 +24,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.hippo.ehviewer.client.exception.ParseException;
-import com.hippo.util.ReadableTime;
-import com.hippo.yorozuya.FileUtils;
-import com.hippo.yorozuya.IOUtils;
+import com.hippo.ehviewer.util.ReadableTime;
+import com.hippo.ehviewer.yorozuya.FileUtils;
+import com.hippo.ehviewer.yorozuya.IOUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/app/src/main/java/com/hippo/ehviewer/Crash.kt b/app/src/main/java/com/hippo/ehviewer/Crash.kt
index 4ddd6bc6a..f49d277e9 100644
--- a/app/src/main/java/com/hippo/ehviewer/Crash.kt
+++ b/app/src/main/java/com/hippo/ehviewer/Crash.kt
@@ -17,9 +17,9 @@ package com.hippo.ehviewer
 
 import android.os.Build
 import android.os.Debug
-import com.hippo.util.ReadableTime
-import com.hippo.yorozuya.FileUtils
-import com.hippo.yorozuya.OSUtils
+import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.yorozuya.FileUtils
+import com.hippo.ehviewer.yorozuya.OSUtils
 import java.io.File
 import java.io.FileWriter
 import java.io.PrintWriter
diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
index 833045e11..2d191e842 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
@@ -38,8 +38,8 @@ import com.hippo.ehviewer.dao.buildMainDB
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.legacy.cleanObsoleteCache
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
-import com.hippo.util.ReadableTime
-import com.hippo.yorozuya.FileUtils
+import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.yorozuya.FileUtils
 import eu.kanade.tachiyomi.core.preference.AndroidPreferenceStore
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import eu.kanade.tachiyomi.util.lang.launchIO
diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.kt b/app/src/main/java/com/hippo/ehviewer/EhDB.kt
index 5b26f4286..350cce137 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhDB.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhDB.kt
@@ -33,7 +33,7 @@ import com.hippo.ehviewer.dao.HistoryInfo
 import com.hippo.ehviewer.dao.LocalFavoriteInfo
 import com.hippo.ehviewer.dao.QuickSearch
 import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.util.sendTo
+import com.hippo.ehviewer.util.sendTo
 
 object EhDB {
     private const val CUR_DB_VER = 4
diff --git a/app/src/main/java/com/hippo/ehviewer/EhProxySelector.kt b/app/src/main/java/com/hippo/ehviewer/EhProxySelector.kt
index a2a24c294..274f3e9b9 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhProxySelector.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhProxySelector.kt
@@ -19,8 +19,8 @@ import android.text.TextUtils
 import com.hippo.ehviewer.Settings.proxyIp
 import com.hippo.ehviewer.Settings.proxyPort
 import com.hippo.ehviewer.Settings.proxyType
-import com.hippo.network.InetValidator.isValidInetPort
-import com.hippo.util.ExceptionUtils
+import com.hippo.ehviewer.network.InetValidator.isValidInetPort
+import com.hippo.ehviewer.util.ExceptionUtils
 import java.io.IOException
 import java.net.InetAddress
 import java.net.InetSocketAddress
diff --git a/app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.java b/app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.java
index 82ec4dbd2..d1aa785cf 100644
--- a/app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.java
+++ b/app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.java
@@ -19,7 +19,7 @@ package com.hippo.ehviewer;
 import android.annotation.SuppressLint;
 
 import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.yorozuya.IntIdGenerator;
+import com.hippo.ehviewer.yorozuya.IntIdGenerator;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/app/src/main/java/com/hippo/ehviewer/Hosts.java b/app/src/main/java/com/hippo/ehviewer/Hosts.java
index b4108f2a1..45463e409 100644
--- a/app/src/main/java/com/hippo/ehviewer/Hosts.java
+++ b/app/src/main/java/com/hippo/ehviewer/Hosts.java
@@ -29,8 +29,8 @@ import android.util.Pair;
 
 import androidx.annotation.Nullable;
 
-import com.hippo.database.MSQLiteBuilder;
-import com.hippo.util.SqlUtils;
+import com.hippo.ehviewer.database.MSQLiteBuilder;
+import com.hippo.ehviewer.util.SqlUtils;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.kt b/app/src/main/java/com/hippo/ehviewer/Settings.kt
index 80368d542..a8f1fa02e 100755
--- a/app/src/main/java/com/hippo/ehviewer/Settings.kt
+++ b/app/src/main/java/com/hippo/ehviewer/Settings.kt
@@ -23,9 +23,9 @@ import androidx.preference.PreferenceManager
 import com.hippo.ehviewer.EhApplication.Companion.application
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.ehviewer.ui.scene.GalleryListScene
+import com.hippo.ehviewer.yorozuya.LayoutUtils.dp2pix
+import com.hippo.ehviewer.yorozuya.NumberUtils
 import com.hippo.unifile.UniFile
-import com.hippo.yorozuya.LayoutUtils.dp2pix
-import com.hippo.yorozuya.NumberUtils
 import java.util.Locale
 
 object Settings {
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.kt b/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.kt
index f0043f40e..96b3ea40e 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.kt
@@ -16,8 +16,8 @@
 package com.hippo.ehviewer.client
 
 import com.hippo.ehviewer.EhApplication
-import com.hippo.network.CookieDatabase
-import com.hippo.network.CookieSet
+import com.hippo.ehviewer.network.CookieDatabase
+import com.hippo.ehviewer.network.CookieSet
 import eu.kanade.tachiyomi.util.lang.launchIO
 import okhttp3.Cookie
 import okhttp3.CookieJar
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt
index 91de6e192..2b64db826 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt
@@ -45,7 +45,7 @@ import com.hippo.ehviewer.client.parser.VoteCommentParser
 import com.hippo.ehviewer.client.parser.VoteTagParser
 import com.hippo.ehviewer.dailycheck.showEventNotification
 import com.hippo.ehviewer.dailycheck.today
-import com.hippo.network.StatusCodeException
+import com.hippo.ehviewer.network.StatusCodeException
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import moe.tarsin.coroutines.runSuspendCatching
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.kt b/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.kt
index 26efc7400..582d18eb9 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.kt
@@ -20,8 +20,8 @@ import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.EhApplication.Companion.nonCacheOkHttpClient
 import com.hippo.ehviewer.R
-import com.hippo.yorozuya.FileUtils
-import com.hippo.yorozuya.copyToFile
+import com.hippo.ehviewer.yorozuya.FileUtils
+import com.hippo.ehviewer.yorozuya.copyToFile
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt b/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt
index b5530c20b..2faba1251 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt
@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client
 
 import com.hippo.ehviewer.Settings
-import com.hippo.network.UrlBuilder
+import com.hippo.ehviewer.network.UrlBuilder
 
 object EhUrl {
     const val SITE_E = 0
diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/FavListUrlBuilder.kt b/app/src/main/java/com/hippo/ehviewer/client/data/FavListUrlBuilder.kt
index 5e109dad0..f72863f39 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/data/FavListUrlBuilder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/data/FavListUrlBuilder.kt
@@ -17,8 +17,8 @@ package com.hippo.ehviewer.client.data
 
 import android.os.Parcelable
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.network.UrlBuilder
-import com.hippo.util.encodeUTF8
+import com.hippo.ehviewer.network.UrlBuilder
+import com.hippo.ehviewer.util.encodeUTF8
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt b/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt
index ef0a5269c..0ee0d6972 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt
@@ -21,11 +21,11 @@ import androidx.annotation.IntDef
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.dao.QuickSearch
-import com.hippo.ehviewer.widget.AdvanceSearchTable
-import com.hippo.network.UrlBuilder
-import com.hippo.util.encodeUTF8
-import com.hippo.yorozuya.NumberUtils
-import com.hippo.yorozuya.StringUtils
+import com.hippo.ehviewer.network.UrlBuilder
+import com.hippo.ehviewer.ui.legacy.AdvanceSearchTable
+import com.hippo.ehviewer.util.encodeUTF8
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
 import kotlinx.parcelize.Parcelize
 import java.io.UnsupportedEncodingException
 import java.net.URLDecoder
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/FavoritesParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/FavoritesParser.kt
index 5ecbf3db3..74529b4d5 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/FavoritesParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/FavoritesParser.kt
@@ -19,8 +19,8 @@ import com.hippo.ehviewer.GetText.getString
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.JsoupUtils
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.JsoupUtils
 import org.jsoup.Jsoup
 
 object FavoritesParser {
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/ForumsParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/ForumsParser.kt
index 1367d17c9..5373bd8ca 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/ForumsParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/ForumsParser.kt
@@ -17,7 +17,7 @@ package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.util.ExceptionUtils
+import com.hippo.ehviewer.util.ExceptionUtils
 import org.jsoup.Jsoup
 
 object ForumsParser {
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryApiParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryApiParser.kt
index 68d1805f3..cfd46dd71 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryApiParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryApiParser.kt
@@ -18,7 +18,7 @@ package com.hippo.ehviewer.client.parser
 import com.hippo.ehviewer.client.EhUtils.getCategory
 import com.hippo.ehviewer.client.EhUtils.handleThumbUrlResolution
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
 import org.json.JSONObject
 
 object GalleryApiParser {
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt
index abcefd21a..38d13a98b 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt
@@ -34,12 +34,12 @@ import com.hippo.ehviewer.client.exception.OffensiveException
 import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.client.exception.PiningException
 import com.hippo.ehviewer.client.getPreviewThumbKey
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.JsoupUtils
-import com.hippo.yorozuya.NumberUtils
-import com.hippo.yorozuya.StringUtils
-import com.hippo.yorozuya.trimAnd
-import com.hippo.yorozuya.unescapeXml
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.JsoupUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
+import com.hippo.ehviewer.yorozuya.trimAnd
+import com.hippo.ehviewer.yorozuya.unescapeXml
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.kt
index 1a0a0521c..27de2dd26 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.kt
@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
 import java.util.regex.Pattern
 
 /**
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.kt
index bf3f93ed2..40401af2f 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.kt
@@ -21,9 +21,9 @@ import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.JsoupUtils
-import com.hippo.yorozuya.NumberUtils
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.JsoupUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListUrlParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListUrlParser.kt
index 7ebd90ae2..8d6350803 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListUrlParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListUrlParser.kt
@@ -20,7 +20,7 @@ import android.os.Build
 import android.text.TextUtils
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.data.ListUrlBuilder
-import com.hippo.yorozuya.Utilities
+import com.hippo.ehviewer.yorozuya.Utilities
 import java.io.UnsupportedEncodingException
 import java.net.MalformedURLException
 import java.net.URL
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryMultiPageViewerPTokenParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryMultiPageViewerPTokenParser.kt
index a0ea3b50b..9fe2f1e35 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryMultiPageViewerPTokenParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryMultiPageViewerPTokenParser.kt
@@ -18,7 +18,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.util.ExceptionUtils
+import com.hippo.ehviewer.util.ExceptionUtils
 import org.json.JSONArray
 
 object GalleryMultiPageViewerPTokenParser {
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryNotAvailableParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryNotAvailableParser.kt
index 11894486f..0c72d440b 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryNotAvailableParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryNotAvailableParser.kt
@@ -17,8 +17,8 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.JsoupUtils
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.JsoupUtils
 import org.jsoup.Jsoup
 
 object GalleryNotAvailableParser {
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageApiParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageApiParser.kt
index 4f65431b0..70d40c4f0 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageApiParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageApiParser.kt
@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.yorozuya.StringUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
 import org.json.JSONException
 import org.json.JSONObject
 import java.util.regex.Matcher
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.kt
index 4fcf86184..a5821e35d 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.kt
@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.yorozuya.StringUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
 import java.util.regex.Pattern
 
 object GalleryPageParser {
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageUrlParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageUrlParser.kt
index 08ae34ca4..ab71d5e02 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageUrlParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageUrlParser.kt
@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
 import java.util.regex.Pattern
 
 /**
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryTokenApiParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryTokenApiParser.kt
index a8e588ecb..d3bd2627d 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryTokenApiParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryTokenApiParser.kt
@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.util.ExceptionUtils
+import com.hippo.ehviewer.util.ExceptionUtils
 import org.json.JSONObject
 
 object GalleryTokenApiParser {
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/ParserUtils.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/ParserUtils.kt
index c93413a6e..a004d9330 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/ParserUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/ParserUtils.kt
@@ -15,8 +15,8 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.yorozuya.NumberUtils
-import com.hippo.yorozuya.StringUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
 import java.time.Instant
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/ProfileParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/ProfileParser.kt
index 2548d09d0..afbfc57e6 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/ProfileParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/ProfileParser.kt
@@ -18,7 +18,7 @@ package com.hippo.ehviewer.client.parser
 import android.util.Log
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.util.ExceptionUtils
+import com.hippo.ehviewer.util.ExceptionUtils
 import org.jsoup.Jsoup
 
 object ProfileParser {
diff --git a/app/src/main/java/com/hippo/database/MSQLiteBuilder.kt b/app/src/main/java/com/hippo/ehviewer/database/MSQLiteBuilder.kt
similarity index 99%
rename from app/src/main/java/com/hippo/database/MSQLiteBuilder.kt
rename to app/src/main/java/com/hippo/ehviewer/database/MSQLiteBuilder.kt
index 34f701a4a..7cab67806 100644
--- a/app/src/main/java/com/hippo/database/MSQLiteBuilder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/database/MSQLiteBuilder.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.database
+package com.hippo.ehviewer.database
 
 import android.content.Context
 import android.database.sqlite.SQLiteOpenHelper
diff --git a/app/src/main/java/com/hippo/database/MSQLiteOpenHelper.kt b/app/src/main/java/com/hippo/ehviewer/database/MSQLiteOpenHelper.kt
similarity index 94%
rename from app/src/main/java/com/hippo/database/MSQLiteOpenHelper.kt
rename to app/src/main/java/com/hippo/ehviewer/database/MSQLiteOpenHelper.kt
index c2fea6c8f..37bc06e80 100644
--- a/app/src/main/java/com/hippo/database/MSQLiteOpenHelper.kt
+++ b/app/src/main/java/com/hippo/ehviewer/database/MSQLiteOpenHelper.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.database
+package com.hippo.ehviewer.database
 
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
-import com.hippo.util.SqlUtils
+import com.hippo.ehviewer.util.SqlUtils
 
 internal class MSQLiteOpenHelper(
     context: Context?,
diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt
index 319cf6be8..df56dddb5 100644
--- a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt
+++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt
@@ -29,11 +29,11 @@ import com.hippo.ehviewer.spider.SpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.OnSpiderListener
 import com.hippo.ehviewer.spider.readCompatFromUniFile
 import com.hippo.ehviewer.spider.write
-import com.hippo.yorozuya.ConcurrentPool
-import com.hippo.yorozuya.MathUtils
-import com.hippo.yorozuya.ObjectUtils
-import com.hippo.yorozuya.SimpleHandler
-import com.hippo.yorozuya.collect.LongList
+import com.hippo.ehviewer.yorozuya.ConcurrentPool
+import com.hippo.ehviewer.yorozuya.MathUtils
+import com.hippo.ehviewer.yorozuya.ObjectUtils
+import com.hippo.ehviewer.yorozuya.SimpleHandler
+import com.hippo.ehviewer.yorozuya.collect.LongList
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import java.util.LinkedList
diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt
index d364fcf6c..4456cb400 100644
--- a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt
+++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt
@@ -36,11 +36,11 @@ import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.ui.MainActivity
 import com.hippo.ehviewer.ui.scene.DownloadsScene
-import com.hippo.util.ReadableTime
-import com.hippo.util.getParcelableExtraCompat
-import com.hippo.yorozuya.FileUtils
-import com.hippo.yorozuya.SimpleHandler
-import com.hippo.yorozuya.collect.LongList
+import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.util.getParcelableExtraCompat
+import com.hippo.ehviewer.yorozuya.FileUtils
+import com.hippo.ehviewer.yorozuya.SimpleHandler
+import com.hippo.ehviewer.yorozuya.collect.LongList
 
 class DownloadService : Service(), DownloadManager.DownloadListener {
     private var mNotifyManager: NotificationManagerCompat? = null
diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt b/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt
index 4aea8938d..6cc3bfa1b 100644
--- a/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt
+++ b/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt
@@ -23,8 +23,8 @@ import android.util.Log
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.image.Image
 import com.hippo.ehviewer.image.rewriteGifSource
+import com.hippo.ehviewer.yorozuya.FileUtils
 import com.hippo.unifile.UniFile
-import com.hippo.yorozuya.FileUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.kt b/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.kt
index c48544812..d53137eca 100644
--- a/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.kt
+++ b/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.kt
@@ -21,8 +21,8 @@ import com.hippo.ehviewer.spider.SpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.Companion.obtainSpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.Companion.releaseSpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.OnSpiderListener
+import com.hippo.ehviewer.yorozuya.SimpleHandler
 import com.hippo.unifile.UniFile
-import com.hippo.yorozuya.SimpleHandler
 import java.util.Locale
 
 class EhPageLoader(private val mGalleryInfo: GalleryInfo) : PageLoader2(), OnSpiderListener {
diff --git a/app/src/main/java/com/hippo/compat/SpiderInfoCompat.kt b/app/src/main/java/com/hippo/ehviewer/legacy/SpiderInfoCompat.kt
similarity index 93%
rename from app/src/main/java/com/hippo/compat/SpiderInfoCompat.kt
rename to app/src/main/java/com/hippo/ehviewer/legacy/SpiderInfoCompat.kt
index 49bd06119..c9816983d 100644
--- a/app/src/main/java/com/hippo/compat/SpiderInfoCompat.kt
+++ b/app/src/main/java/com/hippo/ehviewer/legacy/SpiderInfoCompat.kt
@@ -1,7 +1,7 @@
-package com.hippo.compat
+package com.hippo.ehviewer.legacy
 
 import com.hippo.ehviewer.spider.SpiderInfo
-import com.hippo.yorozuya.IOUtils
+import com.hippo.ehviewer.yorozuya.IOUtils
 import java.io.InputStream
 
 fun readLegacySpiderInfo(inputStream: InputStream): SpiderInfo {
diff --git a/app/src/main/java/com/hippo/network/CookieDatabase.kt b/app/src/main/java/com/hippo/ehviewer/network/CookieDatabase.kt
similarity index 99%
rename from app/src/main/java/com/hippo/network/CookieDatabase.kt
rename to app/src/main/java/com/hippo/ehviewer/network/CookieDatabase.kt
index 4b1b7f54b..3839b89b2 100644
--- a/app/src/main/java/com/hippo/network/CookieDatabase.kt
+++ b/app/src/main/java/com/hippo/ehviewer/network/CookieDatabase.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.network
+package com.hippo.ehviewer.network
 
 import android.content.Context
 import androidx.room.AutoMigration
diff --git a/app/src/main/java/com/hippo/network/CookieSet.kt b/app/src/main/java/com/hippo/ehviewer/network/CookieSet.kt
similarity index 98%
rename from app/src/main/java/com/hippo/network/CookieSet.kt
rename to app/src/main/java/com/hippo/ehviewer/network/CookieSet.kt
index 778ade588..4dd916304 100644
--- a/app/src/main/java/com/hippo/network/CookieSet.kt
+++ b/app/src/main/java/com/hippo/ehviewer/network/CookieSet.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.network
+package com.hippo.ehviewer.network
 
 import okhttp3.Cookie
 import okhttp3.HttpUrl
diff --git a/app/src/main/java/com/hippo/network/InetValidator.kt b/app/src/main/java/com/hippo/ehviewer/network/InetValidator.kt
similarity index 98%
rename from app/src/main/java/com/hippo/network/InetValidator.kt
rename to app/src/main/java/com/hippo/ehviewer/network/InetValidator.kt
index 736ee95ec..89e3c298d 100644
--- a/app/src/main/java/com/hippo/network/InetValidator.kt
+++ b/app/src/main/java/com/hippo/ehviewer/network/InetValidator.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.network
+package com.hippo.ehviewer.network
 
 import java.util.regex.Pattern
 
diff --git a/app/src/main/java/com/hippo/network/StatusCodeException.kt b/app/src/main/java/com/hippo/ehviewer/network/StatusCodeException.kt
similarity index 99%
rename from app/src/main/java/com/hippo/network/StatusCodeException.kt
rename to app/src/main/java/com/hippo/ehviewer/network/StatusCodeException.kt
index 8ec35276c..4aea870eb 100644
--- a/app/src/main/java/com/hippo/network/StatusCodeException.kt
+++ b/app/src/main/java/com/hippo/ehviewer/network/StatusCodeException.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.network
+package com.hippo.ehviewer.network
 
 import android.util.SparseArray
 import com.hippo.ehviewer.EhApplication
diff --git a/app/src/main/java/com/hippo/network/UrlBuilder.kt b/app/src/main/java/com/hippo/ehviewer/network/UrlBuilder.kt
similarity index 97%
rename from app/src/main/java/com/hippo/network/UrlBuilder.kt
rename to app/src/main/java/com/hippo/ehviewer/network/UrlBuilder.kt
index a17d109f0..fbd897d08 100644
--- a/app/src/main/java/com/hippo/network/UrlBuilder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/network/UrlBuilder.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.network
+package com.hippo.ehviewer.network
 
 class UrlBuilder(private var mRootUrl: String) {
     private var mQueryMap: MutableMap<String, Any> = HashMap()
diff --git a/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt
index 6e9c95aa3..918953ca8 100644
--- a/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt
+++ b/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt
@@ -25,9 +25,9 @@ import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.ui.SettingsActivity
+import com.hippo.ehviewer.ui.legacy.preference.MessagePreference
 import com.hippo.ehviewer.ui.scene.BaseScene
-import com.hippo.ehviewer.widget.preference.MessagePreference
-import com.hippo.util.addTextToClipboard
+import com.hippo.ehviewer.util.addTextToClipboard
 import okhttp3.Cookie
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import java.util.LinkedList
diff --git a/app/src/main/java/com/hippo/ehviewer/preference/ImageLimitsPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/ImageLimitsPreference.kt
index 15d92a251..b864996fe 100644
--- a/app/src/main/java/com/hippo/ehviewer/preference/ImageLimitsPreference.kt
+++ b/app/src/main/java/com/hippo/ehviewer/preference/ImageLimitsPreference.kt
@@ -9,7 +9,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.ui.SettingsActivity
-import com.hippo.ehviewer.widget.preference.DialogPreference
+import com.hippo.ehviewer.ui.legacy.preference.DialogPreference
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 
diff --git a/app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.kt
index 6cd151c43..6c6987a8a 100644
--- a/app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.kt
+++ b/app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.kt
@@ -29,10 +29,10 @@ import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.EhProxySelector
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.widget.preference.DialogPreference
-import com.hippo.network.InetValidator
-import com.hippo.yorozuya.MathUtils
-import com.hippo.yorozuya.ViewUtils
+import com.hippo.ehviewer.network.InetValidator
+import com.hippo.ehviewer.ui.legacy.preference.DialogPreference
+import com.hippo.ehviewer.yorozuya.MathUtils
+import com.hippo.ehviewer.yorozuya.ViewUtils
 
 class ProxyPreference @JvmOverloads constructor(
     context: Context,
diff --git a/app/src/main/java/com/hippo/ehviewer/preference/TaskPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/TaskPreference.kt
index bb598bd83..527cf94be 100644
--- a/app/src/main/java/com/hippo/ehviewer/preference/TaskPreference.kt
+++ b/app/src/main/java/com/hippo/ehviewer/preference/TaskPreference.kt
@@ -21,7 +21,7 @@ import androidx.appcompat.app.AlertDialog
 import com.google.android.material.snackbar.Snackbar
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.ui.SettingsActivity
-import com.hippo.ehviewer.widget.preference.DialogPreference
+import com.hippo.ehviewer.ui.legacy.preference.DialogPreference
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt
index cc59f1331..1eb93e828 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt
@@ -30,10 +30,10 @@ import com.hippo.ehviewer.coil.read
 import com.hippo.ehviewer.gallery.SUPPORT_IMAGE_EXTENSIONS
 import com.hippo.ehviewer.image.Image.CloseableSource
 import com.hippo.ehviewer.image.rewriteGifSource2
+import com.hippo.ehviewer.util.sendTo
+import com.hippo.ehviewer.yorozuya.FileUtils
 import com.hippo.unifile.UniFile
 import com.hippo.unifile.openOutputStream
-import com.hippo.util.sendTo
-import com.hippo.yorozuya.FileUtils
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
 import moe.tarsin.coroutines.runSuspendCatching
diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.kt
index 34aa1570c..b18c97e33 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.kt
+++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.kt
@@ -1,8 +1,8 @@
 package com.hippo.ehviewer.spider
 
 import coil.disk.DiskCache
-import com.hippo.compat.readLegacySpiderInfo
 import com.hippo.ehviewer.EhApplication
+import com.hippo.ehviewer.legacy.readLegacySpiderInfo
 import com.hippo.unifile.UniFile
 import com.hippo.unifile.openInputStream
 import com.hippo.unifile.openOutputStream
diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt
index 54dd67ea1..6db2d2f19 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt
@@ -38,8 +38,8 @@ import com.hippo.ehviewer.client.parser.GalleryDetailParser.parsePreviewPages
 import com.hippo.ehviewer.client.parser.GalleryMultiPageViewerPTokenParser
 import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
 import com.hippo.ehviewer.image.Image
+import com.hippo.ehviewer.util.ExceptionUtils
 import com.hippo.unifile.UniFile
-import com.hippo.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
index 1b19809d8..aba2e62ee 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
@@ -29,11 +29,11 @@ import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.download.DownloadService
+import com.hippo.ehviewer.ui.legacy.ListCheckBoxDialogBuilder
 import com.hippo.ehviewer.ui.scene.BaseScene
-import com.hippo.ehviewer.widget.ListCheckBoxDialogBuilder
+import com.hippo.ehviewer.util.requestPermission
+import com.hippo.ehviewer.yorozuya.collect.LongList
 import com.hippo.unifile.UniFile
-import com.hippo.util.requestPermission
-import com.hippo.yorozuya.collect.LongList
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.lang.launchNow
 import eu.kanade.tachiyomi.util.lang.withUIContext
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt b/app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt
index 2530f315f..59beadf44 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt
@@ -40,7 +40,7 @@ import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.GalleryDetail
 import com.hippo.ehviewer.ui.login.LocalNavController
-import com.hippo.util.tellClipboardWithToast
+import com.hippo.ehviewer.util.tellClipboardWithToast
 
 private const val INDEX_URL = 2
 private const val INDEX_PARENT = 9
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
index b4508d622..8811b6595 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
@@ -61,20 +61,20 @@ import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
 import com.hippo.ehviewer.databinding.ActivityMainBinding
 import com.hippo.ehviewer.download.DownloadService
 import com.hippo.ehviewer.image.Image
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
 import com.hippo.ehviewer.ui.login.LoginActivity
 import com.hippo.ehviewer.ui.scene.BaseScene
 import com.hippo.ehviewer.ui.scene.GalleryDetailScene
 import com.hippo.ehviewer.ui.scene.GalleryListScene
 import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs
 import com.hippo.ehviewer.ui.scene.ProgressScene
-import com.hippo.ehviewer.widget.BaseDialogBuilder
-import com.hippo.ehviewer.widget.EditTextDialogBuilder
-import com.hippo.util.addTextToClipboard
-import com.hippo.util.getClipboardManager
-import com.hippo.util.getParcelableExtraCompat
-import com.hippo.util.getUrlFromClipboard
-import com.hippo.util.initLauncher
-import com.hippo.yorozuya.IOUtils
+import com.hippo.ehviewer.util.addTextToClipboard
+import com.hippo.ehviewer.util.getClipboardManager
+import com.hippo.ehviewer.util.getParcelableExtraCompat
+import com.hippo.ehviewer.util.getUrlFromClipboard
+import com.hippo.ehviewer.util.initLauncher
+import com.hippo.ehviewer.yorozuya.IOUtils
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.lang.withUIContext
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/Card.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/Card.kt
similarity index 96%
rename from app/src/main/java/com/hippo/ehviewer/ui/widget/Card.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/compose/Card.kt
index 59ae5d132..3ee51a79f 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/widget/Card.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/Card.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.ColumnScope
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/DeferedComposable.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/DeferedComposable.kt
similarity index 93%
rename from app/src/main/java/com/hippo/ehviewer/ui/widget/DeferedComposable.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/compose/DeferedComposable.kt
index 1390c547f..df1d00719 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/widget/DeferedComposable.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/DeferedComposable.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/Dialog.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/Dialog.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/ui/widget/Dialog.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/compose/Dialog.kt
index b42852b61..74b5af432 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/widget/Dialog.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/Dialog.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.annotation.StringRes
 import androidx.compose.material3.AlertDialog
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/Dummy.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/Dummy.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/ui/widget/Dummy.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/compose/Dummy.kt
index 03a604f4d..8906b34f9 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/widget/Dummy.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/Dummy.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.combinedClickable
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/EhAsyncThumb.kt
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/compose/EhAsyncThumb.kt
index 75486755d..d392b769e 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/EhAsyncThumb.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import android.graphics.drawable.BitmapDrawable
 import androidx.compose.foundation.layout.Box
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryDetailWidgets.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/GalleryDetailWidgets.kt
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryDetailWidgets.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/compose/GalleryDetailWidgets.kt
index 7e8d5cd18..d5f0dbae8 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryDetailWidgets.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/GalleryDetailWidgets.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/GalleryInfoCard.kt
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/compose/GalleryInfoCard.kt
index fd4387250..f60466369 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/GalleryInfoCard.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/RatingWidget.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/RatingWidget.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/ui/widget/RatingWidget.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/compose/RatingWidget.kt
index 947d3db04..a9e3c4a8e 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/widget/RatingWidget.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/RatingWidget.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/Theme.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/Theme.kt
similarity index 93%
rename from app/src/main/java/com/hippo/ehviewer/ui/widget/Theme.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/compose/Theme.kt
index e206f68bd..9db449c99 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/widget/Theme.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/Theme.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt
index 18b00783d..304ff4b5a 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt
@@ -34,12 +34,12 @@ import com.hippo.ehviewer.GetText
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
 import com.hippo.ehviewer.ui.scene.BaseScene
-import com.hippo.ehviewer.widget.BaseDialogBuilder
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.LogCat
-import com.hippo.util.ReadableTime
-import com.hippo.yorozuya.IOUtils
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.LogCat
+import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.yorozuya.IOUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.delay
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.kt
index a1a6d85dc..1bdeffa2c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.kt
@@ -25,10 +25,10 @@ import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
 import com.hippo.ehviewer.ui.scene.BaseScene
-import com.hippo.ehviewer.widget.BaseDialogBuilder
+import com.hippo.ehviewer.util.ExceptionUtils
 import com.hippo.unifile.UniFile
-import com.hippo.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchNonCancellable
 
 class DownloadFragment : BasePreferenceFragment() {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.kt
index ea382a18b..d89a81df7 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.kt
@@ -40,9 +40,9 @@ import com.google.android.material.textfield.TextInputLayout
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhFilter
 import com.hippo.ehviewer.dao.Filter
-import com.hippo.ehviewer.widget.BaseDialogBuilder
-import com.hippo.ehviewer.widget.ViewTransition
-import com.hippo.yorozuya.ViewUtils
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.legacy.ViewTransition
+import com.hippo.ehviewer.yorozuya.ViewUtils
 
 class FilterFragment : BaseFragment() {
     private var mViewTransition: ViewTransition? = null
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.kt
index faa0bcd5a..048b793a1 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.kt
@@ -33,8 +33,8 @@ import com.google.android.material.textfield.TextInputLayout
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.Hosts
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.widget.BaseDialogBuilder
-import com.hippo.ehviewer.widget.ViewTransition
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.legacy.ViewTransition
 
 class HostsFragment : BaseFragment(), View.OnClickListener {
     private var hosts: Hosts? = null
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.kt
index 7aa5f444d..2e1079236 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.kt
@@ -31,7 +31,7 @@ import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.databinding.ActivityWebviewBinding
-import com.hippo.ehviewer.widget.DialogWebChromeClient
+import com.hippo.ehviewer.ui.legacy.DialogWebChromeClient
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import rikka.core.res.resolveColor
 
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/UConfigFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/UConfigFragment.kt
index 91d933c70..5bf92a1ec 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/UConfigFragment.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/UConfigFragment.kt
@@ -38,8 +38,8 @@ import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhCookieStore.KEY_SETTINGS_PROFILE
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.databinding.ActivityWebviewBinding
+import com.hippo.ehviewer.ui.legacy.DialogWebChromeClient
 import com.hippo.ehviewer.ui.scene.BaseScene
-import com.hippo.ehviewer.widget.DialogWebChromeClient
 import eu.kanade.tachiyomi.util.lang.launchIO
 import okhttp3.Cookie
 import okhttp3.HttpUrl.Companion.toHttpUrl
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/AboveSnackerLayout.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/AboveSnackerLayout.java
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/AboveSnackerLayout.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/AboveSnackerLayout.java
index 499f759c5..2686c54ab 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/AboveSnackerLayout.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/AboveSnackerLayout.java
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import static androidx.core.util.ObjectsCompat.requireNonNull;
 
@@ -22,7 +22,7 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 
 import com.drakeet.drawer.FullDraggableHelper;
 import com.google.android.material.snackbar.Snackbar;
-import com.hippo.yorozuya.LayoutUtils;
+import com.hippo.ehviewer.yorozuya.LayoutUtils;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/AddDeleteDrawable.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/AddDeleteDrawable.java
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/AddDeleteDrawable.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/AddDeleteDrawable.java
index 98d9ade96..75a45e98d 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/AddDeleteDrawable.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/AddDeleteDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.animation.ObjectAnimator;
 import android.content.Context;
@@ -30,7 +30,7 @@ import android.graphics.drawable.Drawable;
 import androidx.annotation.Keep;
 
 import com.hippo.ehviewer.R;
-import com.hippo.yorozuya.MathUtils;
+import com.hippo.ehviewer.yorozuya.MathUtils;
 
 public class AddDeleteDrawable extends Drawable {
 
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/AdvanceSearchTable.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/AdvanceSearchTable.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/AdvanceSearchTable.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/AdvanceSearchTable.kt
index f7661d1c1..9db802ae5 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/AdvanceSearchTable.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/AdvanceSearchTable.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.content.Context
 import android.util.AttributeSet
@@ -28,7 +28,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import com.google.android.material.textfield.TextInputLayout
 import com.hippo.ehviewer.R
-import com.hippo.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
 
 class AdvanceSearchTable @JvmOverloads constructor(
     context: Context,
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/BaseDialogBuilder.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/BaseDialogBuilder.kt
similarity index 84%
rename from app/src/main/java/com/hippo/ehviewer/widget/BaseDialogBuilder.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/BaseDialogBuilder.kt
index 7b8011095..e0f54f72d 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/BaseDialogBuilder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/BaseDialogBuilder.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.content.Context
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/BringOutTransition.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/BringOutTransition.java
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/BringOutTransition.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/BringOutTransition.java
index b74b435bb..711873166 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/BringOutTransition.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/BringOutTransition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/CheckBoxDialogBuilder.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/CheckBoxDialogBuilder.kt
similarity index 97%
rename from app/src/main/java/com/hippo/ehviewer/widget/CheckBoxDialogBuilder.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/CheckBoxDialogBuilder.kt
index 1d17ddc5d..d7f5819f4 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/CheckBoxDialogBuilder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/CheckBoxDialogBuilder.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.content.Context
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/ContentLayout.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/ContentLayout.kt
index 7778362f8..13d4ddb3f 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/ContentLayout.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.app.Activity
 import android.content.Context
@@ -29,15 +29,15 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.databinding.WidgetContentLayoutBinding
-import com.hippo.ehviewer.widget.ViewTransition.OnShowViewListener
-import com.hippo.ehviewer.widget.easyrecyclerview.HandlerDrawable
-import com.hippo.ehviewer.widget.easyrecyclerview.LayoutManagerUtils
-import com.hippo.ehviewer.widget.easyrecyclerview.LayoutManagerUtils.OnScrollToPositionListener
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.getParcelableCompat
-import com.hippo.yorozuya.IntIdGenerator
-import com.hippo.yorozuya.LayoutUtils
-import com.hippo.yorozuya.collect.IntList
+import com.hippo.ehviewer.ui.legacy.ViewTransition.OnShowViewListener
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.HandlerDrawable
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.LayoutManagerUtils
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.LayoutManagerUtils.OnScrollToPositionListener
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.getParcelableCompat
+import com.hippo.ehviewer.yorozuya.IntIdGenerator
+import com.hippo.ehviewer.yorozuya.LayoutUtils
+import com.hippo.ehviewer.yorozuya.collect.IntList
 import rikka.core.res.resolveColor
 
 class ContentLayout(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) {
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/DialogWebChromeClient.java
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/DialogWebChromeClient.java
index 9e13c8172..9ba70ef82 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/DialogWebChromeClient.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/DrawerView.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/DrawerView.java
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/DrawerView.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/DrawerView.java
index 695479d33..e151491ce 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/DrawerView.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/DrawerView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/EditTextDialogBuilder.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/EditTextDialogBuilder.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/EditTextDialogBuilder.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/EditTextDialogBuilder.kt
index 36264b6c4..47238ca4c 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/EditTextDialogBuilder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/EditTextDialogBuilder.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.content.Context
 import android.content.DialogInterface
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/FabLayout.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/FabLayout.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/FabLayout.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/FabLayout.kt
index e4d8f7822..a74bf2150 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/FabLayout.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/FabLayout.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.animation.Animator
 import android.content.Context
@@ -27,9 +27,9 @@ import androidx.activity.ComponentActivity
 import androidx.activity.OnBackPressedCallback
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.hippo.ehviewer.R
-import com.hippo.util.getParcelableCompat
-import com.hippo.yorozuya.AnimationUtils
-import com.hippo.yorozuya.SimpleAnimatorListener
+import com.hippo.ehviewer.util.getParcelableCompat
+import com.hippo.ehviewer.yorozuya.AnimationUtils
+import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener
 
 class FabLayout @JvmOverloads constructor(
     context: Context,
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/GalleryInfoContentHelper.kt
similarity index 95%
rename from app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/GalleryInfoContentHelper.kt
index b095c609c..d21fddcf9 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/GalleryInfoContentHelper.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -21,8 +21,8 @@ import android.os.Parcelable
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.FavouriteStatusRouter
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.widget.ContentLayout.ContentHelper
-import com.hippo.yorozuya.IntIdGenerator
+import com.hippo.ehviewer.ui.legacy.ContentLayout.ContentHelper
+import com.hippo.ehviewer.yorozuya.IntIdGenerator
 import java.time.Instant
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/GalleryRatingBar.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/GalleryRatingBar.java
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/GalleryRatingBar.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/GalleryRatingBar.java
index e6f564d63..69b2597d0 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/GalleryRatingBar.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/GalleryRatingBar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/ImageSearchLayout.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/ImageSearchLayout.kt
index 99d8b65e7..aec2d1a2b 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/ImageSearchLayout.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -35,8 +35,8 @@ import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.data.ListUrlBuilder
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.image.Image
+import com.hippo.ehviewer.util.pickVisualMedia
 import com.hippo.unifile.UniFile
-import com.hippo.util.pickVisualMedia
 import kotlinx.coroutines.launch
 
 class ImageSearchLayout @JvmOverloads constructor(
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/IndicatingListView.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/IndicatingListView.java
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/IndicatingListView.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/IndicatingListView.java
index 45271e764..e415a7c30 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/IndicatingListView.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/IndicatingListView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/LinkifyTextView.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/LinkifyTextView.java
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/LinkifyTextView.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/LinkifyTextView.java
index 83cf8868d..1c4462715 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/LinkifyTextView.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/LinkifyTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/ListCheckBoxDialogBuilder.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/ListCheckBoxDialogBuilder.kt
similarity index 96%
rename from app/src/main/java/com/hippo/ehviewer/widget/ListCheckBoxDialogBuilder.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/ListCheckBoxDialogBuilder.kt
index 41099efa2..2427421ce 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/ListCheckBoxDialogBuilder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/ListCheckBoxDialogBuilder.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -24,7 +24,7 @@ import android.widget.CheckBox
 import android.widget.ListView
 import androidx.appcompat.app.AlertDialog
 import com.hippo.ehviewer.R
-import com.hippo.yorozuya.ViewUtils
+import com.hippo.ehviewer.yorozuya.ViewUtils
 
 class ListCheckBoxDialogBuilder(
     context: Context,
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/ObservedTextView.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/ObservedTextView.java
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/ObservedTextView.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/ObservedTextView.java
index c753a6d48..a34131f0f 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/ObservedTextView.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/ObservedTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/RadioGridGroup.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/RadioGridGroup.java
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/widget/RadioGridGroup.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/RadioGridGroup.java
index 712bc32b8..0bc0e2357 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/RadioGridGroup.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/RadioGridGroup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -26,7 +26,7 @@ import android.widget.RadioButton;
 
 import androidx.annotation.IdRes;
 
-import com.hippo.yorozuya.ViewUtils;
+import com.hippo.ehviewer.yorozuya.ViewUtils;
 
 public class RadioGridGroup extends SimpleGridLayout {
 
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchDatabase.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchDatabase.java
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/SearchDatabase.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchDatabase.java
index d06bd05cf..44942c4c0 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SearchDatabase.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchDatabase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -25,7 +25,7 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.hippo.util.SqlUtils;
+import com.hippo.ehviewer.util.SqlUtils;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
similarity index 97%
rename from app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
index 8bf5e78e6..10aaa0d64 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -44,11 +44,11 @@ import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.ListUrlBuilder
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
-import com.hippo.ehviewer.widget.easyrecyclerview.MarginItemDecoration
-import com.hippo.ehviewer.widget.easyrecyclerview.SimpleHolder
-import com.hippo.yorozuya.NumberUtils
-import com.hippo.yorozuya.ViewUtils
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.MarginItemDecoration
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.SimpleHolder
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.ViewUtils
 
 @SuppressLint("InflateParams")
 class SearchLayout @JvmOverloads constructor(
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SimpleGridLayout.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleGridLayout.java
similarity index 97%
rename from app/src/main/java/com/hippo/ehviewer/widget/SimpleGridLayout.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleGridLayout.java
index ce749af07..49052b731 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SimpleGridLayout.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleGridLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -23,8 +23,8 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.hippo.ehviewer.R;
-import com.hippo.yorozuya.MathUtils;
-import com.hippo.yorozuya.ViewUtils;
+import com.hippo.ehviewer.yorozuya.MathUtils;
+import com.hippo.ehviewer.yorozuya.ViewUtils;
 
 /**
  * not scrollable
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SimpleRatingView.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleRatingView.kt
similarity index 87%
rename from app/src/main/java/com/hippo/ehviewer/widget/SimpleRatingView.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleRatingView.kt
index a040d8418..9432a32c1 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SimpleRatingView.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleRatingView.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.content.Context
 import android.util.AttributeSet
@@ -8,7 +8,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.AbstractComposeView
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
-import com.hippo.ehviewer.ui.widget.GalleryListCardRating
+import com.hippo.ehviewer.ui.compose.GalleryListCardRating
 
 class SimpleRatingView @JvmOverloads constructor(
     context: Context,
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/URLImageGetter.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/URLImageGetter.kt
similarity index 95%
rename from app/src/main/java/com/hippo/ehviewer/widget/URLImageGetter.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/URLImageGetter.kt
index 3a0b5d950..3f6b52d87 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/URLImageGetter.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/URLImageGetter.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.graphics.drawable.Drawable
 import android.text.Html.ImageGetter
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/UnikeryDrawable.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/UnikeryDrawable.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/UnikeryDrawable.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/UnikeryDrawable.kt
index ed640e0ac..f6c74fb9f 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/UnikeryDrawable.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/UnikeryDrawable.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.graphics.drawable.AnimatedImageDrawable
 import android.graphics.drawable.Drawable
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/ViewTransition.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/ViewTransition.java
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/widget/ViewTransition.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/ViewTransition.java
index 08fb4b218..74e101174 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/ViewTransition.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/ViewTransition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/app/src/main/java/com/hippo/ehviewer/WindowInsetsAnimationHelper.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/WindowInsetsAnimationHelper.java
similarity index 97%
rename from app/src/main/java/com/hippo/ehviewer/WindowInsetsAnimationHelper.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/WindowInsetsAnimationHelper.java
index 35b6572e5..9adb4316b 100644
--- a/app/src/main/java/com/hippo/ehviewer/WindowInsetsAnimationHelper.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/WindowInsetsAnimationHelper.java
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.hippo.ehviewer;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.view.View;
 
@@ -24,7 +24,7 @@ import androidx.annotation.NonNull;
 import androidx.core.view.WindowInsetsAnimationCompat;
 import androidx.core.view.WindowInsetsCompat;
 
-import com.hippo.yorozuya.MathUtils;
+import com.hippo.ehviewer.yorozuya.MathUtils;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/WrapDrawable.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/WrapDrawable.java
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/WrapDrawable.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/WrapDrawable.java
index 862614124..412415bd1 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/WrapDrawable.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/WrapDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/EasyRecyclerView.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/EasyRecyclerView.java
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/EasyRecyclerView.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/EasyRecyclerView.java
index 8196b1767..34c778202 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/EasyRecyclerView.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/EasyRecyclerView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.easyrecyclerview;
+package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
 
 import android.content.Context;
 import android.os.Parcel;
@@ -31,7 +31,7 @@ import androidx.annotation.NonNull;
 import androidx.collection.LongSparseArray;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.hippo.yorozuya.NumberUtils;
+import com.hippo.ehviewer.yorozuya.NumberUtils;
 
 /**
  * Add setChoiceMode for RecyclerView
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/FastScroller.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/FastScroller.java
similarity index 97%
rename from app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/FastScroller.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/FastScroller.java
index f0d118ddd..c3d30b412 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/FastScroller.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/FastScroller.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.easyrecyclerview;
+package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
@@ -33,11 +33,11 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.hippo.ehviewer.R;
-import com.hippo.yorozuya.AnimationUtils;
-import com.hippo.yorozuya.LayoutUtils;
-import com.hippo.yorozuya.MathUtils;
-import com.hippo.yorozuya.SimpleAnimatorListener;
-import com.hippo.yorozuya.SimpleHandler;
+import com.hippo.ehviewer.yorozuya.AnimationUtils;
+import com.hippo.ehviewer.yorozuya.LayoutUtils;
+import com.hippo.ehviewer.yorozuya.MathUtils;
+import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener;
+import com.hippo.ehviewer.yorozuya.SimpleHandler;
 
 public class FastScroller extends View {
 
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/HandlerDrawable.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/HandlerDrawable.java
similarity index 97%
rename from app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/HandlerDrawable.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/HandlerDrawable.java
index 8a2fdbb5f..881df6735 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/HandlerDrawable.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/HandlerDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.easyrecyclerview;
+package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/LayoutManagerUtils.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/LayoutManagerUtils.java
similarity index 97%
rename from app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/LayoutManagerUtils.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/LayoutManagerUtils.java
index 63edc9267..a07bd3eb8 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/LayoutManagerUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/LayoutManagerUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.easyrecyclerview;
+package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
 
 import android.content.Context;
 import android.graphics.PointF;
@@ -23,8 +23,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
-import com.hippo.yorozuya.MathUtils;
-import com.hippo.yorozuya.SimpleHandler;
+import com.hippo.ehviewer.yorozuya.MathUtils;
+import com.hippo.ehviewer.yorozuya.SimpleHandler;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/MarginItemDecoration.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/MarginItemDecoration.java
similarity index 97%
rename from app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/MarginItemDecoration.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/MarginItemDecoration.java
index 4a1e35b2a..848914aee 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/MarginItemDecoration.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/MarginItemDecoration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.easyrecyclerview;
+package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
 
 import android.graphics.Rect;
 import android.view.View;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleHolder.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/SimpleHolder.java
similarity index 93%
rename from app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleHolder.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/SimpleHolder.java
index 4255745bb..5e9ff8335 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleHolder.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/SimpleHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.easyrecyclerview;
+package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
 
 import android.view.View;
 
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleSmoothScroller.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/SimpleSmoothScroller.java
similarity index 95%
rename from app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleSmoothScroller.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/SimpleSmoothScroller.java
index 8956f5682..e669d0e1b 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleSmoothScroller.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/SimpleSmoothScroller.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.easyrecyclerview;
+package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/preference/DialogPreference.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/preference/DialogPreference.java
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/widget/preference/DialogPreference.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/preference/DialogPreference.java
index 9ed8f51ec..08fc6af2e 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/preference/DialogPreference.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/preference/DialogPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.preference;
+package com.hippo.ehviewer.ui.legacy.preference;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -37,7 +37,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.preference.Preference;
 
-import com.hippo.ehviewer.widget.BaseDialogBuilder;
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder;
 import com.hippo.ehviewer.R;
 
 /**
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/preference/MessagePreference.java b/app/src/main/java/com/hippo/ehviewer/ui/legacy/preference/MessagePreference.java
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/preference/MessagePreference.java
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/preference/MessagePreference.java
index 41f1679ae..e1990b4f9 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/preference/MessagePreference.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/preference/MessagePreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.preference;
+package com.hippo.ehviewer.ui.legacy.preference;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/preference/UrlPreference.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/preference/UrlPreference.kt
similarity index 96%
rename from app/src/main/java/com/hippo/ehviewer/widget/preference/UrlPreference.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/preference/UrlPreference.kt
index b02347af8..dafa4bdbe 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/preference/UrlPreference.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/preference/UrlPreference.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget.preference
+package com.hippo.ehviewer.ui.legacy.preference
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefresh.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/pullrefresh/PullRefresh.kt
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefresh.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/pullrefresh/PullRefresh.kt
index 7de5c0ef9..5bdd8e336 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefresh.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/pullrefresh/PullRefresh.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.pullrefresh
+package com.hippo.ehviewer.ui.legacy.pullrefresh
 
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicator.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/pullrefresh/PullRefreshIndicator.kt
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicator.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/pullrefresh/PullRefreshIndicator.kt
index c355298a3..76f0675b8 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicator.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/pullrefresh/PullRefreshIndicator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.pullrefresh
+package com.hippo.ehviewer.ui.legacy.pullrefresh
 
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.core.LinearEasing
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicatorTransform.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/pullrefresh/PullRefreshIndicatorTransform.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicatorTransform.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/pullrefresh/PullRefreshIndicatorTransform.kt
index 1893cd2d8..a5ca1518a 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicatorTransform.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/pullrefresh/PullRefreshIndicatorTransform.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.pullrefresh
+package com.hippo.ehviewer.ui.legacy.pullrefresh
 
 import androidx.compose.animation.core.LinearOutSlowInEasing
 import androidx.compose.ui.Modifier
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshState.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/pullrefresh/PullRefreshState.kt
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshState.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/pullrefresh/PullRefreshState.kt
index 4c63d999d..a269b69a3 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshState.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/pullrefresh/PullRefreshState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.pullrefresh
+package com.hippo.ehviewer.ui.legacy.pullrefresh
 
 import androidx.compose.animation.core.animate
 import androidx.compose.foundation.MutatorMutex
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/recyclerview/AutoStaggeredGridLayoutManager.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/recyclerview/AutoStaggeredGridLayoutManager.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/widget/recyclerview/AutoStaggeredGridLayoutManager.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/legacy/recyclerview/AutoStaggeredGridLayoutManager.kt
index f910a7d2d..cdbb7207c 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/recyclerview/AutoStaggeredGridLayoutManager.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/recyclerview/AutoStaggeredGridLayoutManager.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget.recyclerview
+package com.hippo.ehviewer.ui.legacy.recyclerview
 
 import android.view.View
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
index d315a203d..d1768c257 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
@@ -56,8 +56,8 @@ import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.ui.widget.rememberDialogState
-import com.hippo.util.ExceptionUtils
+import com.hippo.ehviewer.ui.compose.rememberDialogState
+import com.hippo.ehviewer.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
 import eu.kanade.tachiyomi.util.lang.withUIContext
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt
index 4f5c84aec..e9a49d3cb 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt
@@ -18,7 +18,7 @@ import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.ui.EhActivity
-import com.hippo.ehviewer.ui.widget.setMD3Content
+import com.hippo.ehviewer.ui.compose.setMD3Content
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
index aa2616263..30e370486 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
@@ -61,9 +61,9 @@ import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
+import com.hippo.ehviewer.ui.compose.rememberDialogState
 import com.hippo.ehviewer.ui.openBrowser
-import com.hippo.ehviewer.ui.widget.rememberDialogState
-import com.hippo.util.ExceptionUtils
+import com.hippo.ehviewer.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
 import eu.kanade.tachiyomi.util.lang.withUIContext
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt
index 011dde55a..c491a5b96 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.viewinterop.AndroidView
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.widget.DialogWebChromeClient
+import com.hippo.ehviewer.ui.legacy.DialogWebChromeClient
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
 import eu.kanade.tachiyomi.util.lang.withUIContext
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt
index a6ab24e06..9748e0865 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt
@@ -59,25 +59,25 @@ import com.hippo.ehviewer.download.DownloadManager.DownloadInfoListener
 import com.hippo.ehviewer.download.DownloadService
 import com.hippo.ehviewer.download.DownloadService.Companion.clear
 import com.hippo.ehviewer.spider.SpiderDen
-import com.hippo.ehviewer.ui.widget.EhAsyncCropThumb
-import com.hippo.ehviewer.ui.widget.setMD3Content
-import com.hippo.ehviewer.widget.BaseDialogBuilder
-import com.hippo.ehviewer.widget.CheckBoxDialogBuilder
-import com.hippo.ehviewer.widget.EditTextDialogBuilder
-import com.hippo.ehviewer.widget.FabLayout
-import com.hippo.ehviewer.widget.FabLayout.OnClickFabListener
-import com.hippo.ehviewer.widget.FabLayout.OnExpandListener
-import com.hippo.ehviewer.widget.ViewTransition
-import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
-import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView.CustomChoiceListener
-import com.hippo.ehviewer.widget.easyrecyclerview.FastScroller.OnDragHandlerListener
-import com.hippo.ehviewer.widget.easyrecyclerview.HandlerDrawable
-import com.hippo.ehviewer.widget.recyclerview.AutoStaggeredGridLayoutManager
-import com.hippo.ehviewer.widget.recyclerview.STRATEGY_MIN_SIZE
+import com.hippo.ehviewer.ui.compose.EhAsyncCropThumb
+import com.hippo.ehviewer.ui.compose.setMD3Content
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.legacy.CheckBoxDialogBuilder
+import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
+import com.hippo.ehviewer.ui.legacy.FabLayout
+import com.hippo.ehviewer.ui.legacy.FabLayout.OnClickFabListener
+import com.hippo.ehviewer.ui.legacy.FabLayout.OnExpandListener
+import com.hippo.ehviewer.ui.legacy.ViewTransition
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView.CustomChoiceListener
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.FastScroller.OnDragHandlerListener
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.HandlerDrawable
+import com.hippo.ehviewer.ui.legacy.recyclerview.AutoStaggeredGridLayoutManager
+import com.hippo.ehviewer.ui.legacy.recyclerview.STRATEGY_MIN_SIZE
+import com.hippo.ehviewer.yorozuya.FileUtils
+import com.hippo.ehviewer.yorozuya.ObjectUtils
+import com.hippo.ehviewer.yorozuya.collect.LongList
 import com.hippo.unifile.UniFile
-import com.hippo.yorozuya.FileUtils
-import com.hippo.yorozuya.ObjectUtils
-import com.hippo.yorozuya.collect.LongList
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchNonCancellable
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt
index 597b33c8a..4d53fab64 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt
@@ -44,27 +44,27 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.WindowInsetsAnimationHelper
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.parser.FavoritesParser
 import com.hippo.ehviewer.ui.CommonOperations
-import com.hippo.ehviewer.widget.AddDeleteDrawable
-import com.hippo.ehviewer.widget.BaseDialogBuilder
-import com.hippo.ehviewer.widget.ContentLayout
-import com.hippo.ehviewer.widget.FabLayout
-import com.hippo.ehviewer.widget.FabLayout.OnClickFabListener
-import com.hippo.ehviewer.widget.FabLayout.OnExpandListener
-import com.hippo.ehviewer.widget.GalleryInfoContentHelper
-import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
-import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView.CustomChoiceListener
-import com.hippo.ehviewer.widget.easyrecyclerview.FastScroller.OnDragHandlerListener
-import com.hippo.util.getParcelableCompat
-import com.hippo.yorozuya.ObjectUtils
-import com.hippo.yorozuya.SimpleHandler
-import com.hippo.yorozuya.ViewUtils
+import com.hippo.ehviewer.ui.legacy.AddDeleteDrawable
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.legacy.ContentLayout
+import com.hippo.ehviewer.ui.legacy.FabLayout
+import com.hippo.ehviewer.ui.legacy.FabLayout.OnClickFabListener
+import com.hippo.ehviewer.ui.legacy.FabLayout.OnExpandListener
+import com.hippo.ehviewer.ui.legacy.GalleryInfoContentHelper
+import com.hippo.ehviewer.ui.legacy.WindowInsetsAnimationHelper
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView.CustomChoiceListener
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.FastScroller.OnDragHandlerListener
+import com.hippo.ehviewer.util.getParcelableCompat
+import com.hippo.ehviewer.yorozuya.ObjectUtils
+import com.hippo.ehviewer.yorozuya.SimpleHandler
+import com.hippo.ehviewer.yorozuya.ViewUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import moe.tarsin.coroutines.runSuspendCatching
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt
index 913cd2211..7cfe6d53c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt
@@ -27,10 +27,10 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.widget.easyrecyclerview.MarginItemDecoration
-import com.hippo.ehviewer.widget.recyclerview.AutoStaggeredGridLayoutManager
-import com.hippo.ehviewer.widget.recyclerview.STRATEGY_MIN_SIZE
-import com.hippo.ehviewer.widget.recyclerview.STRATEGY_SUITABLE_SIZE
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.MarginItemDecoration
+import com.hippo.ehviewer.ui.legacy.recyclerview.AutoStaggeredGridLayoutManager
+import com.hippo.ehviewer.ui.legacy.recyclerview.STRATEGY_MIN_SIZE
+import com.hippo.ehviewer.ui.legacy.recyclerview.STRATEGY_SUITABLE_SIZE
 
 abstract class GalleryAdapter(
     private val mResources: Resources,
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt
index 3cd3019fb..1340d2a24 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt
@@ -61,7 +61,6 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.WindowInsetsAnimationHelper
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhFilter
 import com.hippo.ehviewer.client.EhUrl
@@ -72,28 +71,29 @@ import com.hippo.ehviewer.client.data.ListUrlBuilder
 import com.hippo.ehviewer.client.parser.VoteCommentParser
 import com.hippo.ehviewer.dao.Filter
 import com.hippo.ehviewer.ui.jumpToReaderByPage
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
+import com.hippo.ehviewer.ui.legacy.FabLayout
+import com.hippo.ehviewer.ui.legacy.LinkifyTextView
+import com.hippo.ehviewer.ui.legacy.ObservedTextView
+import com.hippo.ehviewer.ui.legacy.URLImageGetter
+import com.hippo.ehviewer.ui.legacy.ViewTransition
+import com.hippo.ehviewer.ui.legacy.WindowInsetsAnimationHelper
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView
 import com.hippo.ehviewer.ui.navWithUrl
 import com.hippo.ehviewer.ui.openBrowser
 import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs
-import com.hippo.ehviewer.widget.BaseDialogBuilder
-import com.hippo.ehviewer.widget.EditTextDialogBuilder
-import com.hippo.ehviewer.widget.FabLayout
-import com.hippo.ehviewer.widget.LinkifyTextView
-import com.hippo.ehviewer.widget.ObservedTextView
-import com.hippo.ehviewer.widget.URLImageGetter
-import com.hippo.ehviewer.widget.ViewTransition
-import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.ReadableTime
-import com.hippo.util.TextUrl
-import com.hippo.util.addTextToClipboard
-import com.hippo.util.getParcelableCompat
-import com.hippo.util.toBBCode
-import com.hippo.yorozuya.AnimationUtils
-import com.hippo.yorozuya.SimpleAnimatorListener
-import com.hippo.yorozuya.StringUtils
-import com.hippo.yorozuya.ViewUtils
-import com.hippo.yorozuya.collect.IntList
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.util.TextUrl
+import com.hippo.ehviewer.util.addTextToClipboard
+import com.hippo.ehviewer.util.getParcelableCompat
+import com.hippo.ehviewer.util.toBBCode
+import com.hippo.ehviewer.yorozuya.AnimationUtils
+import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener
+import com.hippo.ehviewer.yorozuya.StringUtils
+import com.hippo.ehviewer.yorozuya.ViewUtils
+import com.hippo.ehviewer.yorozuya.collect.IntList
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import moe.tarsin.coroutines.runSuspendCatching
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
index d357d34a3..80cc07103 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
@@ -150,32 +150,32 @@ import com.hippo.ehviewer.ui.CommonOperations
 import com.hippo.ehviewer.ui.GalleryInfoBottomSheet
 import com.hippo.ehviewer.ui.MainActivity
 import com.hippo.ehviewer.ui.addToFavorites
+import com.hippo.ehviewer.ui.compose.CrystalCard
+import com.hippo.ehviewer.ui.compose.EhAsyncPreview
+import com.hippo.ehviewer.ui.compose.GalleryDetailHeaderCard
+import com.hippo.ehviewer.ui.compose.GalleryDetailRating
+import com.hippo.ehviewer.ui.compose.setMD3Content
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.legacy.CheckBoxDialogBuilder
+import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
+import com.hippo.ehviewer.ui.legacy.GalleryRatingBar
+import com.hippo.ehviewer.ui.legacy.GalleryRatingBar.OnUserRateListener
+import com.hippo.ehviewer.ui.legacy.ObservedTextView
+import com.hippo.ehviewer.ui.legacy.URLImageGetter
+import com.hippo.ehviewer.ui.legacy.recyclerview.calculateSuitableSpanCount
 import com.hippo.ehviewer.ui.login.LocalNavController
 import com.hippo.ehviewer.ui.openBrowser
 import com.hippo.ehviewer.ui.removeFromFavorites
 import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs
-import com.hippo.ehviewer.ui.widget.CrystalCard
-import com.hippo.ehviewer.ui.widget.EhAsyncPreview
-import com.hippo.ehviewer.ui.widget.GalleryDetailHeaderCard
-import com.hippo.ehviewer.ui.widget.GalleryDetailRating
-import com.hippo.ehviewer.ui.widget.setMD3Content
-import com.hippo.ehviewer.widget.BaseDialogBuilder
-import com.hippo.ehviewer.widget.CheckBoxDialogBuilder
-import com.hippo.ehviewer.widget.EditTextDialogBuilder
-import com.hippo.ehviewer.widget.GalleryRatingBar
-import com.hippo.ehviewer.widget.GalleryRatingBar.OnUserRateListener
-import com.hippo.ehviewer.widget.ObservedTextView
-import com.hippo.ehviewer.widget.URLImageGetter
-import com.hippo.ehviewer.widget.recyclerview.calculateSuitableSpanCount
-import com.hippo.util.AppHelper
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.ReadableTime
-import com.hippo.util.addTextToClipboard
-import com.hippo.util.getParcelableCompat
-import com.hippo.util.getSystemService
-import com.hippo.yorozuya.FileUtils
-import com.hippo.yorozuya.ViewUtils
-import com.hippo.yorozuya.collect.IntList
+import com.hippo.ehviewer.util.AppHelper
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.util.addTextToClipboard
+import com.hippo.ehviewer.util.getParcelableCompat
+import com.hippo.ehviewer.util.getSystemService
+import com.hippo.ehviewer.yorozuya.FileUtils
+import com.hippo.ehviewer.yorozuya.ViewUtils
+import com.hippo.ehviewer.yorozuya.collect.IntList
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
index ec587a0c5..33484dd4b 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
@@ -35,8 +35,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.ui.widget.GalleryInfoGridItem
-import com.hippo.ehviewer.ui.widget.GalleryInfoListItem
+import com.hippo.ehviewer.ui.compose.GalleryInfoGridItem
+import com.hippo.ehviewer.ui.compose.GalleryInfoListItem
 import eu.kanade.tachiyomi.util.system.pxToDp
 
 abstract class GalleryHolder(composeView: CheckableComposeView) : RecyclerView.ViewHolder(composeView) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
index b36cfc392..8e994cd20 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
@@ -57,7 +57,6 @@ import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.FavouriteStatusRouter
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.WindowInsetsAnimationHelper
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.GalleryInfo
@@ -82,24 +81,25 @@ import com.hippo.ehviewer.download.DownloadManager.DownloadInfoListener
 import com.hippo.ehviewer.ui.CommonOperations
 import com.hippo.ehviewer.ui.addToFavorites
 import com.hippo.ehviewer.ui.dialog.SelectItemWithIconAdapter
+import com.hippo.ehviewer.ui.legacy.AddDeleteDrawable
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.legacy.BringOutTransition
+import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
+import com.hippo.ehviewer.ui.legacy.FabLayout
+import com.hippo.ehviewer.ui.legacy.FabLayout.OnClickFabListener
+import com.hippo.ehviewer.ui.legacy.FabLayout.OnExpandListener
+import com.hippo.ehviewer.ui.legacy.GalleryInfoContentHelper
+import com.hippo.ehviewer.ui.legacy.SearchLayout
+import com.hippo.ehviewer.ui.legacy.ViewTransition
+import com.hippo.ehviewer.ui.legacy.WindowInsetsAnimationHelper
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.FastScroller.OnDragHandlerListener
 import com.hippo.ehviewer.ui.removeFromFavorites
-import com.hippo.ehviewer.widget.AddDeleteDrawable
-import com.hippo.ehviewer.widget.BaseDialogBuilder
-import com.hippo.ehviewer.widget.BringOutTransition
-import com.hippo.ehviewer.widget.EditTextDialogBuilder
-import com.hippo.ehviewer.widget.FabLayout
-import com.hippo.ehviewer.widget.FabLayout.OnClickFabListener
-import com.hippo.ehviewer.widget.FabLayout.OnExpandListener
-import com.hippo.ehviewer.widget.GalleryInfoContentHelper
-import com.hippo.ehviewer.widget.SearchLayout
-import com.hippo.ehviewer.widget.ViewTransition
-import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
-import com.hippo.ehviewer.widget.easyrecyclerview.FastScroller.OnDragHandlerListener
-import com.hippo.util.getParcelableCompat
-import com.hippo.yorozuya.AnimationUtils
-import com.hippo.yorozuya.SimpleAnimatorListener
-import com.hippo.yorozuya.StringUtils
-import com.hippo.yorozuya.ViewUtils
+import com.hippo.ehviewer.util.getParcelableCompat
+import com.hippo.ehviewer.yorozuya.AnimationUtils
+import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener
+import com.hippo.ehviewer.yorozuya.StringUtils
+import com.hippo.ehviewer.yorozuya.ViewUtils
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchUI
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt
index 458cc4794..a77c6e59d 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt
@@ -54,12 +54,12 @@ import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.data.GalleryDetail
 import com.hippo.ehviewer.client.data.GalleryPreview
 import com.hippo.ehviewer.coil.imageRequest
+import com.hippo.ehviewer.ui.compose.EhPreviewItem
+import com.hippo.ehviewer.ui.compose.rememberDialogState
+import com.hippo.ehviewer.ui.compose.setMD3Content
+import com.hippo.ehviewer.ui.legacy.recyclerview.calculateSuitableSpanCount
 import com.hippo.ehviewer.ui.navToReader
-import com.hippo.ehviewer.ui.widget.EhPreviewItem
-import com.hippo.ehviewer.ui.widget.rememberDialogState
-import com.hippo.ehviewer.ui.widget.setMD3Content
-import com.hippo.ehviewer.widget.recyclerview.calculateSuitableSpanCount
-import com.hippo.util.getParcelableCompat
+import com.hippo.ehviewer.util.getParcelableCompat
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import moe.tarsin.coroutines.runSuspendCatching
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
index f56783012..534857884 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
@@ -73,13 +73,13 @@ import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.ui.CommonOperations
 import com.hippo.ehviewer.ui.addToFavorites
+import com.hippo.ehviewer.ui.compose.Deferred
+import com.hippo.ehviewer.ui.compose.GalleryInfoListItem
+import com.hippo.ehviewer.ui.compose.rememberDialogState
+import com.hippo.ehviewer.ui.compose.setMD3Content
 import com.hippo.ehviewer.ui.dialog.SelectItemWithIconAdapter
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
 import com.hippo.ehviewer.ui.removeFromFavorites
-import com.hippo.ehviewer.ui.widget.Deferred
-import com.hippo.ehviewer.ui.widget.GalleryInfoListItem
-import com.hippo.ehviewer.ui.widget.rememberDialogState
-import com.hippo.ehviewer.ui.widget.setMD3Content
-import com.hippo.ehviewer.widget.BaseDialogBuilder
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.system.pxToDp
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt
index 1e06f407f..da8c95cef 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt
@@ -25,9 +25,9 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhEngine
-import com.hippo.ehviewer.widget.ViewTransition
-import com.hippo.util.ExceptionUtils
-import com.hippo.yorozuya.ViewUtils
+import com.hippo.ehviewer.ui.legacy.ViewTransition
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.yorozuya.ViewUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import moe.tarsin.coroutines.runSuspendCatching
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
index 1d2fccbbb..0bb3247e7 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
@@ -23,8 +23,8 @@ import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.databinding.SceneSearchbarBinding
-import com.hippo.ehviewer.widget.BaseDialogBuilder
-import com.hippo.ehviewer.widget.SearchDatabase
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.legacy.SearchDatabase
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
diff --git a/app/src/main/java/com/hippo/util/AppHelper.kt b/app/src/main/java/com/hippo/ehviewer/util/AppHelper.kt
similarity index 97%
rename from app/src/main/java/com/hippo/util/AppHelper.kt
rename to app/src/main/java/com/hippo/ehviewer/util/AppHelper.kt
index f9b92d02a..d80c2787c 100644
--- a/app/src/main/java/com/hippo/util/AppHelper.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/AppHelper.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.util
+package com.hippo.ehviewer.util
 
 import android.app.Activity
 import android.content.Context
diff --git a/app/src/main/java/com/hippo/util/BBCode.kt b/app/src/main/java/com/hippo/ehviewer/util/BBCode.kt
similarity index 98%
rename from app/src/main/java/com/hippo/util/BBCode.kt
rename to app/src/main/java/com/hippo/ehviewer/util/BBCode.kt
index 506b86d2a..3502c0b2b 100644
--- a/app/src/main/java/com/hippo/util/BBCode.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/BBCode.kt
@@ -1,4 +1,4 @@
-package com.hippo.util
+package com.hippo.ehviewer.util
 
 import android.graphics.Typeface
 import android.text.Spanned
diff --git a/app/src/main/java/com/hippo/util/ClipboardUtil.kt b/app/src/main/java/com/hippo/ehviewer/util/ClipboardUtil.kt
similarity index 99%
rename from app/src/main/java/com/hippo/util/ClipboardUtil.kt
rename to app/src/main/java/com/hippo/ehviewer/util/ClipboardUtil.kt
index 933d489fe..4458f6cd2 100644
--- a/app/src/main/java/com/hippo/util/ClipboardUtil.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/ClipboardUtil.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License along with EhViewer.
  * If not, see <https://www.gnu.org/licenses/>.
  */
-package com.hippo.util
+package com.hippo.ehviewer.util
 
 import android.content.ClipData
 import android.content.ClipDescription
diff --git a/app/src/main/java/com/hippo/util/ExceptionUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/ExceptionUtils.kt
similarity index 96%
rename from app/src/main/java/com/hippo/util/ExceptionUtils.kt
rename to app/src/main/java/com/hippo/ehviewer/util/ExceptionUtils.kt
index d149de918..d1cf61eab 100644
--- a/app/src/main/java/com/hippo/util/ExceptionUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/ExceptionUtils.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.util
+package com.hippo.ehviewer.util
 
 import com.hippo.ehviewer.GetText.getString
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.network.StatusCodeException
+import com.hippo.ehviewer.network.StatusCodeException
 import java.net.MalformedURLException
 import java.net.ProtocolException
 import java.net.SocketException
diff --git a/app/src/main/java/com/hippo/util/FDUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/FDUtils.kt
similarity index 93%
rename from app/src/main/java/com/hippo/util/FDUtils.kt
rename to app/src/main/java/com/hippo/ehviewer/util/FDUtils.kt
index 82f9ca9d9..4fb7cc7a3 100644
--- a/app/src/main/java/com/hippo/util/FDUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/FDUtils.kt
@@ -1,4 +1,4 @@
-package com.hippo.util
+package com.hippo.ehviewer.util
 
 import android.os.ParcelFileDescriptor
 import android.system.Int64Ref
diff --git a/app/src/main/java/com/hippo/util/JsoupUtils.java b/app/src/main/java/com/hippo/ehviewer/util/JsoupUtils.java
similarity index 98%
rename from app/src/main/java/com/hippo/util/JsoupUtils.java
rename to app/src/main/java/com/hippo/ehviewer/util/JsoupUtils.java
index aaadd2c32..23df75253 100644
--- a/app/src/main/java/com/hippo/util/JsoupUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/util/JsoupUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.util;
+package com.hippo.ehviewer.util;
 
 import androidx.annotation.Nullable;
 
diff --git a/app/src/main/java/com/hippo/util/LauncherUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/LauncherUtils.kt
similarity index 98%
rename from app/src/main/java/com/hippo/util/LauncherUtils.kt
rename to app/src/main/java/com/hippo/ehviewer/util/LauncherUtils.kt
index b43c4bc38..74a0d890b 100644
--- a/app/src/main/java/com/hippo/util/LauncherUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/LauncherUtils.kt
@@ -1,4 +1,4 @@
-package com.hippo.util
+package com.hippo.ehviewer.util
 
 import android.content.Context
 import android.content.pm.PackageManager
diff --git a/app/src/main/java/com/hippo/util/LogCat.java b/app/src/main/java/com/hippo/ehviewer/util/LogCat.java
similarity index 93%
rename from app/src/main/java/com/hippo/util/LogCat.java
rename to app/src/main/java/com/hippo/ehviewer/util/LogCat.java
index 07020081d..b2d6cbad0 100644
--- a/app/src/main/java/com/hippo/util/LogCat.java
+++ b/app/src/main/java/com/hippo/ehviewer/util/LogCat.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hippo.util;
+package com.hippo.ehviewer.util;
 
-import com.hippo.yorozuya.IOUtils;
+import com.hippo.ehviewer.yorozuya.IOUtils;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/app/src/main/java/com/hippo/util/ParcelableCompat.kt b/app/src/main/java/com/hippo/ehviewer/util/ParcelableCompat.kt
similarity index 97%
rename from app/src/main/java/com/hippo/util/ParcelableCompat.kt
rename to app/src/main/java/com/hippo/ehviewer/util/ParcelableCompat.kt
index 8c64b3270..5f35b4cfd 100644
--- a/app/src/main/java/com/hippo/util/ParcelableCompat.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/ParcelableCompat.kt
@@ -1,6 +1,6 @@
 @file:Suppress("DEPRECATION")
 
-package com.hippo.util
+package com.hippo.ehviewer.util
 
 import android.content.Intent
 import android.os.Bundle
diff --git a/app/src/main/java/com/hippo/util/ReadableTime.java b/app/src/main/java/com/hippo/ehviewer/util/ReadableTime.java
similarity index 99%
rename from app/src/main/java/com/hippo/util/ReadableTime.java
rename to app/src/main/java/com/hippo/ehviewer/util/ReadableTime.java
index 48788f4af..11775b144 100644
--- a/app/src/main/java/com/hippo/util/ReadableTime.java
+++ b/app/src/main/java/com/hippo/ehviewer/util/ReadableTime.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.util;
+package com.hippo.ehviewer.util;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/app/src/main/java/com/hippo/util/SqlUtils.java b/app/src/main/java/com/hippo/ehviewer/util/SqlUtils.java
similarity index 99%
rename from app/src/main/java/com/hippo/util/SqlUtils.java
rename to app/src/main/java/com/hippo/ehviewer/util/SqlUtils.java
index eb0a43b51..089f409fc 100644
--- a/app/src/main/java/com/hippo/util/SqlUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/util/SqlUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.util;
+package com.hippo.ehviewer.util;
 
 import android.database.Cursor;
 import android.database.SQLException;
diff --git a/app/src/main/java/com/hippo/util/TextUrl.java b/app/src/main/java/com/hippo/ehviewer/util/TextUrl.java
similarity index 98%
rename from app/src/main/java/com/hippo/util/TextUrl.java
rename to app/src/main/java/com/hippo/ehviewer/util/TextUrl.java
index 1a6867154..0ae13a1ee 100644
--- a/app/src/main/java/com/hippo/util/TextUrl.java
+++ b/app/src/main/java/com/hippo/ehviewer/util/TextUrl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.util;
+package com.hippo.ehviewer.util;
 
 import android.text.Spannable;
 import android.text.SpannableString;
diff --git a/app/src/main/java/com/hippo/util/URLEncoderCompat.kt b/app/src/main/java/com/hippo/ehviewer/util/URLEncoderCompat.kt
similarity index 93%
rename from app/src/main/java/com/hippo/util/URLEncoderCompat.kt
rename to app/src/main/java/com/hippo/ehviewer/util/URLEncoderCompat.kt
index f09a844bd..b169ebb19 100644
--- a/app/src/main/java/com/hippo/util/URLEncoderCompat.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/URLEncoderCompat.kt
@@ -1,4 +1,4 @@
-package com.hippo.util
+package com.hippo.ehviewer.util
 
 import android.os.Build
 import java.net.URLEncoder
diff --git a/app/src/main/java/com/hippo/yorozuya/AnimationUtils.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/AnimationUtils.java
similarity index 97%
rename from app/src/main/java/com/hippo/yorozuya/AnimationUtils.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/AnimationUtils.java
index f31f96398..75bbca8c2 100644
--- a/app/src/main/java/com/hippo/yorozuya/AnimationUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/AnimationUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import android.view.animation.Interpolator;
 
diff --git a/app/src/main/java/com/hippo/yorozuya/ConcurrentPool.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/ConcurrentPool.java
similarity index 97%
rename from app/src/main/java/com/hippo/yorozuya/ConcurrentPool.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/ConcurrentPool.java
index 10681ef7c..f866b3dbb 100644
--- a/app/src/main/java/com/hippo/yorozuya/ConcurrentPool.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/ConcurrentPool.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 public class ConcurrentPool<T> {
 
diff --git a/app/src/main/java/com/hippo/yorozuya/FileUtils.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/FileUtils.java
similarity index 99%
rename from app/src/main/java/com/hippo/yorozuya/FileUtils.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/FileUtils.java
index 7dc16feb6..77d202466 100644
--- a/app/src/main/java/com/hippo/yorozuya/FileUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/FileUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import android.text.TextUtils;
 
diff --git a/app/src/main/java/com/hippo/yorozuya/IOUtils.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/IOUtils.java
similarity index 98%
rename from app/src/main/java/com/hippo/yorozuya/IOUtils.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/IOUtils.java
index 259aff7f0..635b04c59 100644
--- a/app/src/main/java/com/hippo/yorozuya/IOUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/IOUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
diff --git a/app/src/main/java/com/hippo/yorozuya/IOUtils.kt b/app/src/main/java/com/hippo/ehviewer/yorozuya/IOUtils.kt
similarity index 86%
rename from app/src/main/java/com/hippo/yorozuya/IOUtils.kt
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/IOUtils.kt
index c46fd7c7d..546922c1e 100644
--- a/app/src/main/java/com/hippo/yorozuya/IOUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/IOUtils.kt
@@ -1,4 +1,4 @@
-package com.hippo.yorozuya
+package com.hippo.ehviewer.yorozuya
 
 import okhttp3.ResponseBody
 import java.io.File
diff --git a/app/src/main/java/com/hippo/yorozuya/IntIdGenerator.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/IntIdGenerator.java
similarity index 97%
rename from app/src/main/java/com/hippo/yorozuya/IntIdGenerator.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/IntIdGenerator.java
index 48e58cc6b..877a24a3b 100644
--- a/app/src/main/java/com/hippo/yorozuya/IntIdGenerator.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/IntIdGenerator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/app/src/main/java/com/hippo/yorozuya/LayoutUtils.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/LayoutUtils.java
similarity index 98%
rename from app/src/main/java/com/hippo/yorozuya/LayoutUtils.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/LayoutUtils.java
index 214114d23..2b3babce9 100644
--- a/app/src/main/java/com/hippo/yorozuya/LayoutUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/LayoutUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/com/hippo/yorozuya/MathUtils.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/MathUtils.java
similarity index 99%
rename from app/src/main/java/com/hippo/yorozuya/MathUtils.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/MathUtils.java
index 9e6e2779b..7172b076b 100644
--- a/app/src/main/java/com/hippo/yorozuya/MathUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/MathUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import java.util.Random;
 
diff --git a/app/src/main/java/com/hippo/yorozuya/NumberUtils.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/NumberUtils.java
similarity index 98%
rename from app/src/main/java/com/hippo/yorozuya/NumberUtils.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/NumberUtils.java
index 74175c999..e1f5b9f2c 100644
--- a/app/src/main/java/com/hippo/yorozuya/NumberUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/NumberUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 public final class NumberUtils {
     private NumberUtils() {
diff --git a/app/src/main/java/com/hippo/yorozuya/OSUtils.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/OSUtils.java
similarity index 98%
rename from app/src/main/java/com/hippo/yorozuya/OSUtils.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/OSUtils.java
index 703a658f9..38bfd4a8c 100644
--- a/app/src/main/java/com/hippo/yorozuya/OSUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/OSUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import android.os.Looper;
 
diff --git a/app/src/main/java/com/hippo/yorozuya/ObjectUtils.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/ObjectUtils.java
similarity index 99%
rename from app/src/main/java/com/hippo/yorozuya/ObjectUtils.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/ObjectUtils.java
index 3cf5eb030..72e49b598 100644
--- a/app/src/main/java/com/hippo/yorozuya/ObjectUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/ObjectUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import androidx.annotation.Nullable;
 
diff --git a/app/src/main/java/com/hippo/yorozuya/SimpleAnimatorListener.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/SimpleAnimatorListener.java
similarity index 96%
rename from app/src/main/java/com/hippo/yorozuya/SimpleAnimatorListener.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/SimpleAnimatorListener.java
index e5fe08e9a..92a8dcd99 100644
--- a/app/src/main/java/com/hippo/yorozuya/SimpleAnimatorListener.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/SimpleAnimatorListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import android.animation.Animator;
 
diff --git a/app/src/main/java/com/hippo/yorozuya/SimpleHandler.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/SimpleHandler.java
similarity index 96%
rename from app/src/main/java/com/hippo/yorozuya/SimpleHandler.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/SimpleHandler.java
index 5937a3636..e9d7a52cc 100644
--- a/app/src/main/java/com/hippo/yorozuya/SimpleHandler.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/SimpleHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import android.os.Handler;
 import android.os.Looper;
diff --git a/app/src/main/java/com/hippo/yorozuya/StringUtils.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/StringUtils.java
similarity index 99%
rename from app/src/main/java/com/hippo/yorozuya/StringUtils.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/StringUtils.java
index 260c37199..42039ba85 100644
--- a/app/src/main/java/com/hippo/yorozuya/StringUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/StringUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import android.text.TextUtils;
 
diff --git a/app/src/main/java/com/hippo/yorozuya/StringUtils.kt b/app/src/main/java/com/hippo/ehviewer/yorozuya/StringUtils.kt
similarity index 85%
rename from app/src/main/java/com/hippo/yorozuya/StringUtils.kt
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/StringUtils.kt
index 5b70889e8..2df92108a 100644
--- a/app/src/main/java/com/hippo/yorozuya/StringUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/StringUtils.kt
@@ -1,4 +1,4 @@
-package com.hippo.yorozuya
+package com.hippo.ehviewer.yorozuya
 
 import org.jsoup.parser.Parser
 
diff --git a/app/src/main/java/com/hippo/yorozuya/Utilities.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/Utilities.java
similarity index 97%
rename from app/src/main/java/com/hippo/yorozuya/Utilities.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/Utilities.java
index 6f55a1d10..e3c40c77b 100644
--- a/app/src/main/java/com/hippo/yorozuya/Utilities.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/Utilities.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import androidx.annotation.Nullable;
 
diff --git a/app/src/main/java/com/hippo/yorozuya/ViewUtils.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/ViewUtils.java
similarity index 99%
rename from app/src/main/java/com/hippo/yorozuya/ViewUtils.java
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/ViewUtils.java
index ff9a72a54..181e326f3 100644
--- a/app/src/main/java/com/hippo/yorozuya/ViewUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/ViewUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.yorozuya;
+package com.hippo.ehviewer.yorozuya;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
diff --git a/app/src/main/java/com/hippo/yorozuya/collect/IntList.kt b/app/src/main/java/com/hippo/ehviewer/yorozuya/collect/IntList.kt
similarity index 82%
rename from app/src/main/java/com/hippo/yorozuya/collect/IntList.kt
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/collect/IntList.kt
index fd3188f14..a1ebaaccd 100644
--- a/app/src/main/java/com/hippo/yorozuya/collect/IntList.kt
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/collect/IntList.kt
@@ -1,4 +1,4 @@
-package com.hippo.yorozuya.collect
+package com.hippo.ehviewer.yorozuya.collect
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
diff --git a/app/src/main/java/com/hippo/yorozuya/collect/LongList.kt b/app/src/main/java/com/hippo/ehviewer/yorozuya/collect/LongList.kt
similarity index 82%
rename from app/src/main/java/com/hippo/yorozuya/collect/LongList.kt
rename to app/src/main/java/com/hippo/ehviewer/yorozuya/collect/LongList.kt
index 4b5d10ed2..43eec2ef4 100644
--- a/app/src/main/java/com/hippo/yorozuya/collect/LongList.kt
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/collect/LongList.kt
@@ -1,4 +1,4 @@
-package com.hippo.yorozuya.collect
+package com.hippo.ehviewer.yorozuya.collect
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index f4f0bb48f..746bb86b1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -72,13 +72,13 @@ import com.hippo.ehviewer.gallery.EhPageLoader
 import com.hippo.ehviewer.gallery.PageLoader2
 import com.hippo.ehviewer.image.Image
 import com.hippo.ehviewer.ui.EhActivity
-import com.hippo.ehviewer.widget.EditTextDialogBuilder
+import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.getParcelableCompat
+import com.hippo.ehviewer.util.getParcelableExtraCompat
+import com.hippo.ehviewer.util.sendTo
+import com.hippo.ehviewer.yorozuya.FileUtils
 import com.hippo.unifile.UniFile
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.getParcelableCompat
-import com.hippo.util.getParcelableExtraCompat
-import com.hippo.util.sendTo
-import com.hippo.yorozuya.FileUtils
 import dev.chrisbanes.insetter.applyInsetter
 import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt
index 3d02cf827..547204ab4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt
@@ -3,8 +3,8 @@ package eu.kanade.tachiyomi.ui.reader.loader
 import androidx.annotation.CallSuper
 import androidx.collection.lruCache
 import com.hippo.ehviewer.image.Image
-import com.hippo.yorozuya.MathUtils
-import com.hippo.yorozuya.OSUtils
+import com.hippo.ehviewer.yorozuya.MathUtils
+import com.hippo.ehviewer.yorozuya.OSUtils
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3db57dcd7..ea13e8c70 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -29,7 +29,7 @@
         android:layout_height="match_parent"
         app:fitsSystemWindowsInsets="start|end">
 
-        <com.hippo.ehviewer.widget.AboveSnackerLayout
+        <com.hippo.ehviewer.ui.legacy.AboveSnackerLayout
             android:id="@+id/absnacker"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -40,7 +40,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:defaultNavHost="true" />
-        </com.hippo.ehviewer.widget.AboveSnackerLayout>
+        </com.hippo.ehviewer.ui.legacy.AboveSnackerLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <com.google.android.material.navigation.NavigationView
@@ -51,7 +51,7 @@
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/nav_drawer_main" />
 
-    <com.hippo.ehviewer.widget.DrawerView
+    <com.hippo.ehviewer.ui.legacy.DrawerView
         android:id="@+id/right_drawer"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/dialog_list_checkbox_builder.xml b/app/src/main/res/layout/dialog_list_checkbox_builder.xml
index 99f54f1f6..82b11e8ce 100644
--- a/app/src/main/res/layout/dialog_list_checkbox_builder.xml
+++ b/app/src/main/res/layout/dialog_list_checkbox_builder.xml
@@ -19,7 +19,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <com.hippo.ehviewer.widget.IndicatingListView
+    <com.hippo.ehviewer.ui.legacy.IndicatingListView
         android:id="@+id/list_view"
         style="@style/Indicating"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_rate.xml b/app/src/main/res/layout/dialog_rate.xml
index 0446df02d..eed391a5b 100644
--- a/app/src/main/res/layout/dialog_rate.xml
+++ b/app/src/main/res/layout/dialog_rate.xml
@@ -29,7 +29,7 @@
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="@dimen/text_little_small" />
 
-    <com.hippo.ehviewer.widget.GalleryRatingBar
+    <com.hippo.ehviewer.ui.legacy.GalleryRatingBar
         android:id="@+id/rating_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_recycler_view.xml b/app/src/main/res/layout/dialog_recycler_view.xml
index 756bab6dc..d36ad6d80 100644
--- a/app/src/main/res/layout/dialog_recycler_view.xml
+++ b/app/src/main/res/layout/dialog_recycler_view.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/Indicating"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/drawer_list_rv.xml b/app/src/main/res/layout/drawer_list_rv.xml
index fa7de3af3..624aaba8a 100644
--- a/app/src/main/res/layout/drawer_list_rv.xml
+++ b/app/src/main/res/layout/drawer_list_rv.xml
@@ -44,7 +44,7 @@
                 android:layout_gravity="center"
                 android:visibility="gone" />
 
-            <com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
+            <com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView
                 android:id="@+id/recycler_view_drawer"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/filter_chip.xml b/app/src/main/res/layout/filter_chip.xml
index 324229a9b..d22809b30 100644
--- a/app/src/main/res/layout/filter_chip.xml
+++ b/app/src/main/res/layout/filter_chip.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.hippo.ehviewer.widget.IdentifiedChip xmlns:android="http://schemas.android.com/apk/res/android"
+<com.hippo.ehviewer.ui.legacy.IdentifiedChip xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/Widget.Material3.Chip.Filter"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index a598632ad..fb4e40a04 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -53,7 +53,7 @@
             android:layout_alignStart="@id/title"
             android:layout_marginTop="2dp" />
 
-        <com.hippo.ehviewer.widget.SimpleRatingView
+        <com.hippo.ehviewer.ui.legacy.SimpleRatingView
             android:id="@+id/rating"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_gallery_comment.xml b/app/src/main/res/layout/item_gallery_comment.xml
index 25faf8fba..33bf5c937 100644
--- a/app/src/main/res/layout/item_gallery_comment.xml
+++ b/app/src/main/res/layout/item_gallery_comment.xml
@@ -47,7 +47,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true" />
 
-            <com.hippo.ehviewer.widget.LinkifyTextView
+            <com.hippo.ehviewer.ui.legacy.LinkifyTextView
                 android:id="@+id/comment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/preference_recyclerview.xml b/app/src/main/res/layout/preference_recyclerview.xml
index 21630db69..8fb270e36 100644
--- a/app/src/main/res/layout/preference_recyclerview.xml
+++ b/app/src/main/res/layout/preference_recyclerview.xml
@@ -15,7 +15,7 @@
   ~ You should have received a copy of the GNU General Public License along with EhViewer.
   ~ If not, see <https://www.gnu.org/licenses/>.
   -->
-<com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/list"
diff --git a/app/src/main/res/layout/scene_download.xml b/app/src/main/res/layout/scene_download.xml
index bd0bba0ca..f9a3d90e4 100644
--- a/app/src/main/res/layout/scene_download.xml
+++ b/app/src/main/res/layout/scene_download.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
+        <com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -33,7 +33,7 @@
             android:paddingVertical="@dimen/gallery_list_margin_v"
             app:fitsSystemWindowsInsets="bottom" />
 
-        <com.hippo.ehviewer.widget.easyrecyclerview.FastScroller
+        <com.hippo.ehviewer.ui.legacy.easyrecyclerview.FastScroller
             android:id="@+id/fast_scroller"
             android:layout_width="30dp"
             android:layout_height="match_parent"
@@ -55,7 +55,7 @@
         android:gravity="center_horizontal"
         android:text="@string/no_download_info" />
 
-    <com.hippo.ehviewer.widget.FabLayout
+    <com.hippo.ehviewer.ui.legacy.FabLayout
         android:id="@+id/fab_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -98,6 +98,6 @@
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/v_close_dark_x24" />
 
-    </com.hippo.ehviewer.widget.FabLayout>
+    </com.hippo.ehviewer.ui.legacy.FabLayout>
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml
index af756eb50..9a470e266 100644
--- a/app/src/main/res/layout/scene_favorites.xml
+++ b/app/src/main/res/layout/scene_favorites.xml
@@ -22,13 +22,13 @@
     android:paddingTop="16dp"
     app:layout_behavior="@string/searchbar_scrolling_view_behavior">
 
-    <com.hippo.ehviewer.widget.ContentLayout
+    <com.hippo.ehviewer.ui.legacy.ContentLayout
         android:id="@+id/content_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:fitsSystemWindowsInsets="top|bottom" />
 
-    <com.hippo.ehviewer.widget.FabLayout
+    <com.hippo.ehviewer.ui.legacy.FabLayout
         android:id="@+id/fab_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -86,5 +86,5 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
-    </com.hippo.ehviewer.widget.FabLayout>
+    </com.hippo.ehviewer.ui.legacy.FabLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/scene_gallery_comments.xml b/app/src/main/res/layout/scene_gallery_comments.xml
index 776e1868d..236a769a8 100644
--- a/app/src/main/res/layout/scene_gallery_comments.xml
+++ b/app/src/main/res/layout/scene_gallery_comments.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
+        <com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -91,7 +91,7 @@
         </LinearLayout>
     </FrameLayout>
 
-    <com.hippo.ehviewer.widget.FabLayout
+    <com.hippo.ehviewer.ui.legacy.FabLayout
         android:id="@+id/fab_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -105,5 +105,5 @@
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/v_reply_dark_x24" />
 
-    </com.hippo.ehviewer.widget.FabLayout>
+    </com.hippo.ehviewer.ui.legacy.FabLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/scene_gallery_list.xml b/app/src/main/res/layout/scene_gallery_list.xml
index 9362208d6..7e05e0e89 100644
--- a/app/src/main/res/layout/scene_gallery_list.xml
+++ b/app/src/main/res/layout/scene_gallery_list.xml
@@ -22,13 +22,13 @@
     android:paddingTop="16dp"
     app:layout_behavior="@string/searchbar_scrolling_view_behavior">
 
-    <com.hippo.ehviewer.widget.ContentLayout
+    <com.hippo.ehviewer.ui.legacy.ContentLayout
         android:id="@+id/content_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:fitsSystemWindowsInsets="top|bottom" />
 
-    <com.hippo.ehviewer.widget.SearchLayout
+    <com.hippo.ehviewer.ui.legacy.SearchLayout
         android:id="@+id/search_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -36,7 +36,7 @@
         android:layout_marginEnd="@dimen/gallery_search_bar_margin_v"
         app:layout_fitsSystemWindowsInsets="top|bottom" />
 
-    <com.hippo.ehviewer.widget.FabLayout
+    <com.hippo.ehviewer.ui.legacy.FabLayout
         android:id="@+id/fab_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -66,6 +66,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
-    </com.hippo.ehviewer.widget.FabLayout>
+    </com.hippo.ehviewer.ui.legacy.FabLayout>
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/scene_searchbar.xml b/app/src/main/res/layout/scene_searchbar.xml
index 53add64a7..70067a345 100644
--- a/app/src/main/res/layout/scene_searchbar.xml
+++ b/app/src/main/res/layout/scene_searchbar.xml
@@ -47,7 +47,7 @@
 
     </com.google.android.material.search.SearchView>
 
-    <com.hippo.ehviewer.widget.FabLayout
+    <com.hippo.ehviewer.ui.legacy.FabLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:elevation="6dp"
@@ -64,6 +64,6 @@
             android:visibility="invisible"
             app:srcCompat="@drawable/v_magnify_x24" />
 
-    </com.hippo.ehviewer.widget.FabLayout>
+    </com.hippo.ehviewer.ui.legacy.FabLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/search_advance.xml b/app/src/main/res/layout/search_advance.xml
index 1e58c7a0b..fbb1ecd56 100644
--- a/app/src/main/res/layout/search_advance.xml
+++ b/app/src/main/res/layout/search_advance.xml
@@ -13,7 +13,7 @@
   ~ limitations under the License.
   -->
 
-<com.hippo.ehviewer.widget.AdvanceSearchTable xmlns:android="http://schemas.android.com/apk/res/android"
+<com.hippo.ehviewer.ui.legacy.AdvanceSearchTable xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/search_advance_search_table"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/search_image.xml b/app/src/main/res/layout/search_image.xml
index 8399570e7..93632b63a 100644
--- a/app/src/main/res/layout/search_image.xml
+++ b/app/src/main/res/layout/search_image.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<com.hippo.ehviewer.widget.ImageSearchLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.hippo.ehviewer.ui.legacy.ImageSearchLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/search_image"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/search_normal.xml b/app/src/main/res/layout/search_normal.xml
index 3ca6c0860..c25fa515f 100644
--- a/app/src/main/res/layout/search_normal.xml
+++ b/app/src/main/res/layout/search_normal.xml
@@ -27,7 +27,7 @@
         android:layout_marginBottom="@dimen/search_item_interval"
         app:chipSpacingHorizontal="24dp" />
 
-    <com.hippo.ehviewer.widget.RadioGridGroup
+    <com.hippo.ehviewer.ui.legacy.RadioGridGroup
         android:id="@+id/normal_search_mode"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
             android:minHeight="0dp"
             android:text="@string/search_specify_tag" />
 
-    </com.hippo.ehviewer.widget.RadioGridGroup>
+    </com.hippo.ehviewer.ui.legacy.RadioGridGroup>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/widget_content_layout.xml b/app/src/main/res/layout/widget_content_layout.xml
index fa1ae54c5..bbdeed858 100644
--- a/app/src/main/res/layout/widget_content_layout.xml
+++ b/app/src/main/res/layout/widget_content_layout.xml
@@ -45,7 +45,7 @@
             android:layout_height="match_parent"
             android:clipChildren="false">
 
-            <com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
+            <com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -64,7 +64,7 @@
             app:hideAnimationBehavior="inward"
             app:showAnimationBehavior="outward" />
 
-        <com.hippo.ehviewer.widget.easyrecyclerview.FastScroller
+        <com.hippo.ehviewer.ui.legacy.easyrecyclerview.FastScroller
             android:id="@+id/fast_scroller"
             android:layout_width="30dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/xml/about_settings.xml b/app/src/main/res/xml/about_settings.xml
index 07b749883..32af80b31 100644
--- a/app/src/main/res/xml/about_settings.xml
+++ b/app/src/main/res/xml/about_settings.xml
@@ -29,14 +29,14 @@
         app:enableCopying="true"
         app:iconSpaceReserved="false" />
 
-    <com.hippo.ehviewer.widget.preference.UrlPreference
+    <com.hippo.ehviewer.ui.legacy.preference.UrlPreference
         android:key="latest_release"
         android:title="@string/settings_about_latest_release"
         app:enableCopying="true"
         app:iconSpaceReserved="false"
         app:url="https://github.com/Ehviewer-Overhauled/Ehviewer/releases" />
 
-    <com.hippo.ehviewer.widget.preference.UrlPreference
+    <com.hippo.ehviewer.ui.legacy.preference.UrlPreference
         android:key="source"
         android:title="@string/settings_about_source"
         app:enableCopying="true"
diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml
index baef0615b..4c302c2eb 100644
--- a/app/src/main/res/xml/eh_settings.xml
+++ b/app/src/main/res/xml/eh_settings.xml
@@ -147,7 +147,7 @@
         android:title="@string/settings_eh_show_tag_translations"
         app:iconSpaceReserved="false" />
 
-    <com.hippo.ehviewer.widget.preference.UrlPreference
+    <com.hippo.ehviewer.ui.legacy.preference.UrlPreference
         android:key="tag_translations_source"
         android:title="@string/settings_eh_tag_translations_source"
         app:iconSpaceReserved="false"