diff --git a/app/src/main/java/com/hippo/ehviewer/AppConfig.kt b/app/src/main/java/com/hippo/ehviewer/AppConfig.kt
index ebda0695e..a22a2aa6f 100644
--- a/app/src/main/java/com/hippo/ehviewer/AppConfig.kt
+++ b/app/src/main/java/com/hippo/ehviewer/AppConfig.kt
@@ -17,8 +17,8 @@ package com.hippo.ehviewer
 
 import android.os.Environment
 import com.hippo.ehviewer.client.exception.ParseException
+import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.yorozuya.FileUtils
 import splitties.init.appCtx
 import java.io.File
 
diff --git a/app/src/main/java/com/hippo/ehviewer/Crash.kt b/app/src/main/java/com/hippo/ehviewer/Crash.kt
index 1a2f03f92..e3eec9a79 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.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.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 6e8f12d4c..36869f2d9 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
@@ -45,8 +45,8 @@ import com.hippo.ehviewer.okhttp.httpClient
 import com.hippo.ehviewer.spider.cronetHttpClient
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
 import com.hippo.ehviewer.ui.lockObserver
+import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.yorozuya.FileUtils
 import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
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 cf56be878..7305766db 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.kt
@@ -22,8 +22,8 @@ import androidx.compose.runtime.setValue
 import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.EhApplication.Companion.nonCacheOkHttpClient
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.yorozuya.FileUtils
-import com.hippo.ehviewer.yorozuya.copyToFile
+import com.hippo.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.copyToFile
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
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 6b83b68cd..0e1a1d94e 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
@@ -24,7 +24,7 @@ import com.hippo.ehviewer.client.ehUrl
 import com.hippo.ehviewer.dao.QuickSearch
 import com.hippo.ehviewer.ui.main.AdvanceTable
 import com.hippo.ehviewer.util.encodeUTF8
-import com.hippo.ehviewer.yorozuya.toIntOrDefault
+import com.hippo.ehviewer.util.toIntOrDefault
 import kotlinx.parcelize.Parcelize
 import java.io.UnsupportedEncodingException
 import java.net.URLDecoder
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 1f21bca96..da6293ad5 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
@@ -37,10 +37,10 @@ import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.client.exception.PiningException
 import com.hippo.ehviewer.client.getThumbKey
 import com.hippo.ehviewer.util.ExceptionUtils
-import com.hippo.ehviewer.yorozuya.toFloatOrDefault
-import com.hippo.ehviewer.yorozuya.toIntOrDefault
-import com.hippo.ehviewer.yorozuya.trimAnd
-import com.hippo.ehviewer.yorozuya.unescapeXml
+import com.hippo.ehviewer.util.toFloatOrDefault
+import com.hippo.ehviewer.util.toIntOrDefault
+import com.hippo.ehviewer.util.trimAnd
+import com.hippo.ehviewer.util.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 82bcd2fad..457ad9c6d 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.ehviewer.yorozuya.toLongOrDefault
+import com.hippo.ehviewer.util.toLongOrDefault
 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 a6378f50a..9d7664ab6 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
@@ -22,7 +22,7 @@ import com.hippo.ehviewer.client.data.GalleryInfo.Companion.LOCAL_FAVORITED
 import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
 import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.util.ExceptionUtils
-import com.hippo.ehviewer.yorozuya.toIntOrDefault
+import com.hippo.ehviewer.util.toIntOrDefault
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import java.util.regex.Pattern
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 a6ab9eac7..8ca00e06a 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
@@ -17,7 +17,7 @@ package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.client.parseAs
-import com.hippo.ehviewer.yorozuya.unescapeXml
+import com.hippo.ehviewer.util.unescapeXml
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
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 fc370d248..ef8e5a125 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.ehviewer.yorozuya.unescapeXml
+import com.hippo.ehviewer.util.unescapeXml
 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 5e94c6acd..d8956edb0 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,8 +16,8 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.yorozuya.toIntOrDefault
-import com.hippo.ehviewer.yorozuya.toLongOrDefault
+import com.hippo.ehviewer.util.toIntOrDefault
+import com.hippo.ehviewer.util.toLongOrDefault
 import java.util.regex.Pattern
 
 /**
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 923e190c1..b2901689c 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,9 +15,9 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.yorozuya.toIntOrDefault
-import com.hippo.ehviewer.yorozuya.toLongOrDefault
-import com.hippo.ehviewer.yorozuya.unescapeXml
+import com.hippo.ehviewer.util.toIntOrDefault
+import com.hippo.ehviewer.util.toLongOrDefault
+import com.hippo.ehviewer.util.unescapeXml
 import java.time.Instant
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
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 dc8d893b7..6b3c571b8 100644
--- a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt
+++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt
@@ -31,9 +31,9 @@ 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.ehviewer.yorozuya.ConcurrentPool
-import com.hippo.ehviewer.yorozuya.SimpleHandler
-import com.hippo.ehviewer.yorozuya.collect.LongList
+import com.hippo.ehviewer.util.ConcurrentPool
+import com.hippo.ehviewer.util.LongList
+import com.hippo.ehviewer.util.SimpleHandler
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.CoroutineScope
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 5be829678..3b746f27d 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.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.LongList
 import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.util.SimpleHandler
 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 ab5b346db..8e635a594 100644
--- a/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt
+++ b/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt
@@ -23,7 +23,7 @@ import android.util.Log
 import com.hippo.ehviewer.Settings.archivePasswds
 import com.hippo.ehviewer.image.Image
 import com.hippo.ehviewer.image.rewriteGifSource
-import com.hippo.ehviewer.yorozuya.FileUtils
+import com.hippo.ehviewer.util.FileUtils
 import com.hippo.unifile.UniFile
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
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 faeb9dfbf..11788c88b 100644
--- a/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.kt
+++ b/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.kt
@@ -21,7 +21,7 @@ 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.ehviewer.util.SimpleHandler
 import com.hippo.unifile.UniFile
 import java.util.Locale
 
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 865210944..f4ce9d243 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt
@@ -31,8 +31,8 @@ import com.hippo.ehviewer.download.downloadLocation
 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.FileUtils
 import com.hippo.ehviewer.util.sendTo
-import com.hippo.ehviewer.yorozuya.FileUtils
 import com.hippo.unifile.UniFile
 import com.hippo.unifile.openOutputStream
 import okhttp3.MediaType.Companion.toMediaType
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 ab41aa2db..e141055e2 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
@@ -48,8 +48,8 @@ import com.hippo.ehviewer.download.downloadLocation
 import com.hippo.ehviewer.ui.legacy.ListCheckBoxDialogBuilder
 import com.hippo.ehviewer.ui.scene.BaseScene
 import com.hippo.ehviewer.ui.tools.DialogState
+import com.hippo.ehviewer.util.LongList
 import com.hippo.ehviewer.util.requestPermission
-import com.hippo.ehviewer.yorozuya.collect.LongList
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.lang.launchNow
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/legacy/AboveSnackerLayout.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/AboveSnackerLayout.kt
index 429e9f8ea..572c3cf7e 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/legacy/AboveSnackerLayout.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/AboveSnackerLayout.kt
@@ -17,7 +17,7 @@ import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.drakeet.drawer.FullDraggableHelper
 import com.google.android.material.snackbar.Snackbar.SnackbarLayout
-import com.hippo.ehviewer.yorozuya.dp2px
+import com.hippo.ehviewer.util.dp2px
 
 class AboveSnackerLayout : FrameLayout, AttachedBehavior, FullDraggableHelper.Callback {
     private val helper: FullDraggableHelper
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/legacy/FabLayout.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/FabLayout.kt
index 4174cf9fb..dbc744a77 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/legacy/FabLayout.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/FabLayout.kt
@@ -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.ehviewer.util.AnimationUtils
+import com.hippo.ehviewer.util.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/ui/legacy/FastScroller.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/FastScroller.kt
index 37950c64a..ffe5dc1be 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/legacy/FastScroller.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/FastScroller.kt
@@ -29,10 +29,10 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
 import com.google.android.material.math.MathUtils.dist
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.yorozuya.AnimationUtils
-import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener
-import com.hippo.ehviewer.yorozuya.SimpleHandler
-import com.hippo.ehviewer.yorozuya.dp2px
+import com.hippo.ehviewer.util.AnimationUtils
+import com.hippo.ehviewer.util.SimpleAnimatorListener
+import com.hippo.ehviewer.util.SimpleHandler
+import com.hippo.ehviewer.util.dp2px
 import kotlin.math.abs
 
 class FastScroller : View {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/legacy/LayoutManagerUtils.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/LayoutManagerUtils.kt
index c1537d82d..28252c11b 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/legacy/LayoutManagerUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/LayoutManagerUtils.kt
@@ -21,7 +21,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView.LayoutManager
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.google.android.material.math.MathUtils
-import com.hippo.ehviewer.yorozuya.SimpleHandler
+import com.hippo.ehviewer.util.SimpleHandler
 import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method
 import kotlin.math.abs
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 dabcc99bf..f7b19587e 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
@@ -93,9 +93,9 @@ import com.hippo.ehviewer.ui.main.requestOf
 import com.hippo.ehviewer.ui.navToReader
 import com.hippo.ehviewer.ui.setMD3Content
 import com.hippo.ehviewer.ui.tools.CropDefaults
+import com.hippo.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.LongList
 import com.hippo.ehviewer.util.sendTo
-import com.hippo.ehviewer.yorozuya.FileUtils
-import com.hippo.ehviewer.yorozuya.collect.LongList
 import com.hippo.unifile.UniFile
 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 e4a426629..e73c5bb3b 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
@@ -80,10 +80,10 @@ import com.hippo.ehviewer.ui.legacy.ViewTransition
 import com.hippo.ehviewer.ui.legacy.WindowInsetsAnimationHelper
 import com.hippo.ehviewer.ui.setMD3Content
 import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.SimpleHandler
 import com.hippo.ehviewer.util.getValue
 import com.hippo.ehviewer.util.lazyMut
 import com.hippo.ehviewer.util.setValue
-import com.hippo.ehviewer.yorozuya.SimpleHandler
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.lang.withIOContext
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 a0b8e44fa..1f48ae0ea 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
@@ -33,7 +33,7 @@ import com.hippo.ehviewer.ui.legacy.AutoStaggeredGridLayoutManager
 import com.hippo.ehviewer.ui.legacy.MarginItemDecoration
 import com.hippo.ehviewer.ui.legacy.STRATEGY_MIN_SIZE
 import com.hippo.ehviewer.ui.legacy.STRATEGY_SUITABLE_SIZE
-import com.hippo.ehviewer.yorozuya.dp2px
+import com.hippo.ehviewer.util.dp2px
 import splitties.init.appCtx
 
 private val diffCallback = object : DiffUtil.ItemCallback<GalleryInfo>() {
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 b2182a844..5fd3118e0 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
@@ -81,15 +81,15 @@ import com.hippo.ehviewer.ui.legacy.ViewTransition
 import com.hippo.ehviewer.ui.legacy.WindowInsetsAnimationHelper
 import com.hippo.ehviewer.ui.openBrowser
 import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs
+import com.hippo.ehviewer.util.AnimationUtils
 import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.IntList
 import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.util.SimpleAnimatorListener
 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.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 664dac483..f231e349f 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
@@ -159,11 +159,11 @@ import com.hippo.ehviewer.ui.tools.FilledTertiaryIconToggleButton
 import com.hippo.ehviewer.ui.tools.GalleryDetailRating
 import com.hippo.ehviewer.util.AppHelper
 import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.IntList
 import com.hippo.ehviewer.util.ReadableTime
 import com.hippo.ehviewer.util.addTextToClipboard
 import com.hippo.ehviewer.util.getParcelableCompat
-import com.hippo.ehviewer.yorozuya.FileUtils
-import com.hippo.ehviewer.yorozuya.collect.IntList
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.CancellationException
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 db5f57266..d0de2d478 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
@@ -96,13 +96,13 @@ import com.hippo.ehviewer.ui.setMD3Content
 import com.hippo.ehviewer.ui.settings.showNewVersion
 import com.hippo.ehviewer.ui.tools.DialogState
 import com.hippo.ehviewer.updater.AppUpdater
+import com.hippo.ehviewer.util.AnimationUtils
 import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.SimpleAnimatorListener
 import com.hippo.ehviewer.util.getParcelableCompat
 import com.hippo.ehviewer.util.getValue
 import com.hippo.ehviewer.util.lazyMut
 import com.hippo.ehviewer.util.setValue
-import com.hippo.ehviewer.yorozuya.AnimationUtils
-import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.lang.withIOContext
diff --git a/app/src/main/java/com/hippo/ehviewer/yorozuya/AnimationUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/AnimationUtils.kt
similarity index 96%
rename from app/src/main/java/com/hippo/ehviewer/yorozuya/AnimationUtils.kt
rename to app/src/main/java/com/hippo/ehviewer/util/AnimationUtils.kt
index 14e8b641c..01bb95218 100644
--- a/app/src/main/java/com/hippo/ehviewer/yorozuya/AnimationUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/AnimationUtils.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util
 
 import android.view.animation.Interpolator
 import androidx.interpolator.view.animation.FastOutLinearInInterpolator
diff --git a/app/src/main/java/com/hippo/ehviewer/yorozuya/ConcurrentPool.kt b/app/src/main/java/com/hippo/ehviewer/util/ConcurrentPool.kt
similarity index 97%
rename from app/src/main/java/com/hippo/ehviewer/yorozuya/ConcurrentPool.kt
rename to app/src/main/java/com/hippo/ehviewer/util/ConcurrentPool.kt
index 7069555c8..86220d6ca 100644
--- a/app/src/main/java/com/hippo/ehviewer/yorozuya/ConcurrentPool.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/ConcurrentPool.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util
 
 class ConcurrentPool<T>(size: Int) {
     private val mArray: Array<T?>
diff --git a/app/src/main/java/com/hippo/ehviewer/yorozuya/FileUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/FileUtils.kt
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/yorozuya/FileUtils.kt
rename to app/src/main/java/com/hippo/ehviewer/util/FileUtils.kt
index 0cbcb611e..1026b5fb6 100644
--- a/app/src/main/java/com/hippo/ehviewer/yorozuya/FileUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/FileUtils.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util
 
 import java.io.File
 import java.util.Locale
diff --git a/app/src/main/java/com/hippo/ehviewer/yorozuya/IOUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/IOUtils.kt
similarity index 86%
rename from app/src/main/java/com/hippo/ehviewer/yorozuya/IOUtils.kt
rename to app/src/main/java/com/hippo/ehviewer/util/IOUtils.kt
index 546922c1e..6874064e7 100644
--- a/app/src/main/java/com/hippo/ehviewer/yorozuya/IOUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/IOUtils.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util
 
 import okhttp3.ResponseBody
 import java.io.File
diff --git a/app/src/main/java/com/hippo/ehviewer/yorozuya/collect/IntList.kt b/app/src/main/java/com/hippo/ehviewer/util/IntList.kt
similarity index 81%
rename from app/src/main/java/com/hippo/ehviewer/yorozuya/collect/IntList.kt
rename to app/src/main/java/com/hippo/ehviewer/util/IntList.kt
index 17cc1dfbe..b8310f506 100644
--- a/app/src/main/java/com/hippo/ehviewer/yorozuya/collect/IntList.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/IntList.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.yorozuya.collect
+package com.hippo.ehviewer.util
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
diff --git a/app/src/main/java/com/hippo/ehviewer/yorozuya/LayoutUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/LayoutUtils.kt
similarity index 96%
rename from app/src/main/java/com/hippo/ehviewer/yorozuya/LayoutUtils.kt
rename to app/src/main/java/com/hippo/ehviewer/util/LayoutUtils.kt
index 7fa1f89aa..4556c94d9 100644
--- a/app/src/main/java/com/hippo/ehviewer/yorozuya/LayoutUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/LayoutUtils.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util
 
 import android.content.Context
 import android.util.TypedValue.COMPLEX_UNIT_DIP
diff --git a/app/src/main/java/com/hippo/ehviewer/yorozuya/collect/LongList.kt b/app/src/main/java/com/hippo/ehviewer/util/LongList.kt
similarity index 81%
rename from app/src/main/java/com/hippo/ehviewer/yorozuya/collect/LongList.kt
rename to app/src/main/java/com/hippo/ehviewer/util/LongList.kt
index fc138cd69..df7186101 100644
--- a/app/src/main/java/com/hippo/ehviewer/yorozuya/collect/LongList.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/LongList.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.yorozuya.collect
+package com.hippo.ehviewer.util
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
diff --git a/app/src/main/java/com/hippo/ehviewer/yorozuya/OSUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/OSUtils.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/yorozuya/OSUtils.kt
rename to app/src/main/java/com/hippo/ehviewer/util/OSUtils.kt
index 82e86cb8d..78716c589 100644
--- a/app/src/main/java/com/hippo/ehviewer/yorozuya/OSUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/OSUtils.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util
 
 import java.io.BufferedReader
 import java.io.FileReader
diff --git a/app/src/main/java/com/hippo/ehviewer/yorozuya/SimpleAnimatorListener.kt b/app/src/main/java/com/hippo/ehviewer/util/SimpleAnimatorListener.kt
similarity index 96%
rename from app/src/main/java/com/hippo/ehviewer/yorozuya/SimpleAnimatorListener.kt
rename to app/src/main/java/com/hippo/ehviewer/util/SimpleAnimatorListener.kt
index 3acd8a4f8..35d25f3f4 100644
--- a/app/src/main/java/com/hippo/ehviewer/yorozuya/SimpleAnimatorListener.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/SimpleAnimatorListener.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util
 
 import android.animation.Animator
 
diff --git a/app/src/main/java/com/hippo/ehviewer/yorozuya/SimpleHandler.kt b/app/src/main/java/com/hippo/ehviewer/util/SimpleHandler.kt
similarity index 95%
rename from app/src/main/java/com/hippo/ehviewer/yorozuya/SimpleHandler.kt
rename to app/src/main/java/com/hippo/ehviewer/util/SimpleHandler.kt
index 70835dbae..d7c38febc 100644
--- a/app/src/main/java/com/hippo/ehviewer/yorozuya/SimpleHandler.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/SimpleHandler.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util
 
 import android.os.Handler
 import android.os.Looper
diff --git a/app/src/main/java/com/hippo/ehviewer/yorozuya/StringUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/StringUtils.kt
similarity index 93%
rename from app/src/main/java/com/hippo/ehviewer/yorozuya/StringUtils.kt
rename to app/src/main/java/com/hippo/ehviewer/util/StringUtils.kt
index 8f4ba343f..9e4b9a739 100644
--- a/app/src/main/java/com/hippo/ehviewer/yorozuya/StringUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/StringUtils.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util
 
 import org.jsoup.parser.Parser
 
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 d8288e33c..ce0755c62 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
@@ -77,10 +77,10 @@ import com.hippo.ehviewer.ui.EhActivity
 import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
 import com.hippo.ehviewer.ui.setMD3Content
 import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.FileUtils
 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 dev.chrisbanes.insetter.applyInsetter
 import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
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 00c4c0ed1..76a448898 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,7 +3,7 @@ package eu.kanade.tachiyomi.ui.reader.loader
 import androidx.annotation.CallSuper
 import androidx.collection.lruCache
 import com.hippo.ehviewer.image.Image
-import com.hippo.ehviewer.yorozuya.OSUtils
+import com.hippo.ehviewer.util.OSUtils
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.ui.reader.model.ReaderPage