diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
index 220c88f19..71d8d0588 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
@@ -21,6 +21,15 @@ import eu.kanade.tachiyomi.data.database.queries.HistoryQueries
 import eu.kanade.tachiyomi.data.database.queries.MangaCategoryQueries
 import eu.kanade.tachiyomi.data.database.queries.MangaQueries
 import eu.kanade.tachiyomi.data.database.queries.TrackQueries
+import exh.metadata.sql.mappers.SearchMetadataTypeMapping
+import exh.metadata.sql.mappers.SearchTagTypeMapping
+import exh.metadata.sql.mappers.SearchTitleTypeMapping
+import exh.metadata.sql.models.SearchMetadata
+import exh.metadata.sql.models.SearchTag
+import exh.metadata.sql.models.SearchTitle
+import exh.metadata.sql.queries.SearchMetadataQueries
+import exh.metadata.sql.queries.SearchTagQueries
+import exh.metadata.sql.queries.SearchTitleQueries
 import io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory
 
 /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt
index 5f1762d98..2763f2f1f 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt
@@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.data.database.tables.HistoryTable
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
 import eu.kanade.tachiyomi.data.database.tables.MergedTable
-import eu.kanade.tachiyomi.data.database.tables.SearchMetadataTable
 import eu.kanade.tachiyomi.data.database.tables.TrackTable
 import exh.metadata.sql.tables.SearchMetadataTable
 import exh.metadata.sql.tables.SearchTagTable
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
index 6dc741fcf..1901213d9 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
@@ -16,7 +16,7 @@ import eu.kanade.tachiyomi.data.database.tables.CategoryTable
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
-import eu.kanade.tachiyomi.data.database.tables.SearchMetadataTable
+import exh.metadata.sql.tables.SearchMetadataTable
 
 interface MangaQueries : DbProvider {
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
index 0b84d386b..31f94abd0 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
@@ -28,10 +28,10 @@ import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
 import eu.kanade.tachiyomi.ui.browse.source.latest.LatestUpdatesController
 import eu.kanade.tachiyomi.ui.setting.SettingsSourcesController
-import eu.kanade.tachiyomi.ui.smartsearch.SmartSearchController
 import eu.kanade.tachiyomi.ui.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.source.global_search.GlobalSearchController
 import eu.kanade.tachiyomi.ui.source.latest.LatestUpdatesController
+import exh.ui.smartsearch.SmartSearchController
 import kotlinx.android.parcel.Parcelize
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
index 064e0034c..135391dd8 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
@@ -5,9 +5,9 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
-import eu.kanade.tachiyomi.data.database.tables.SearchMetadataTable
 import eu.kanade.tachiyomi.ui.category.CategoryAdapter
 import exh.isLewdSource
+import exh.metadata.sql.tables.SearchMetadataTable
 import exh.search.SearchEngine
 import exh.util.await
 import exh.util.cancellable
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
index 555506301..2bfdce489 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
@@ -21,7 +21,6 @@ import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.databinding.MigrationListControllerBinding
-import eu.kanade.tachiyomi.smartsearch.SmartSearchEngine
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
@@ -36,6 +35,7 @@ import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.system.toast
+import exh.smartsearch.SmartSearchEngine
 import exh.util.RecyclerWindowInsetsListener
 import exh.util.applyWindowInsetsForController
 import exh.util.await
diff --git a/app/src/main/java/exh/debug/SettingsDebugController.kt b/app/src/main/java/exh/debug/SettingsDebugController.kt
index d7c92d572..3783e58d3 100644
--- a/app/src/main/java/exh/debug/SettingsDebugController.kt
+++ b/app/src/main/java/exh/debug/SettingsDebugController.kt
@@ -2,7 +2,6 @@ package exh.debug
 
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.text.Html
 import android.util.Log
 import android.widget.HorizontalScrollView
 import android.widget.TextView
diff --git a/app/src/main/java/exh/favorites/FavoritesIntroDialog.kt b/app/src/main/java/exh/favorites/FavoritesIntroDialog.kt
index d38095881..ebc3fef36 100644
--- a/app/src/main/java/exh/favorites/FavoritesIntroDialog.kt
+++ b/app/src/main/java/exh/favorites/FavoritesIntroDialog.kt
@@ -1,7 +1,6 @@
 package exh.favorites
 
 import android.content.Context
-import android.text.Html
 import androidx.core.text.HtmlCompat
 import com.afollestad.materialdialogs.MaterialDialog
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
diff --git a/app/src/main/java/exh/log/EHDebugModeOverlay.kt b/app/src/main/java/exh/log/EHDebugModeOverlay.kt
index 2d63c283a..d421a8019 100644
--- a/app/src/main/java/exh/log/EHDebugModeOverlay.kt
+++ b/app/src/main/java/exh/log/EHDebugModeOverlay.kt
@@ -1,7 +1,6 @@
 package exh.log
 
 import android.content.Context
-import android.text.Html
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
diff --git a/app/src/main/java/exh/metadata/metadata/base/FlatMetadata.kt b/app/src/main/java/exh/metadata/metadata/base/FlatMetadata.kt
index f26cd7179..b8aec0370 100644
--- a/app/src/main/java/exh/metadata/metadata/base/FlatMetadata.kt
+++ b/app/src/main/java/exh/metadata/metadata/base/FlatMetadata.kt
@@ -2,7 +2,7 @@ package exh.metadata.metadata.base
 
 import com.pushtorefresh.storio.operations.PreparedOperation
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
-import eu.kanade.tachiyomi.data.database.models.SearchMetadata
+import exh.metadata.sql.models.SearchMetadata
 import exh.metadata.sql.models.SearchTag
 import exh.metadata.sql.models.SearchTitle
 import kotlin.reflect.KClass
diff --git a/app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt
index 7c558c557..f9ee13659 100644
--- a/app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt
+++ b/app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt
@@ -1,9 +1,9 @@
 package exh.metadata.metadata.base
 
 import com.google.gson.GsonBuilder
-import eu.kanade.tachiyomi.data.database.models.SearchMetadata
 import eu.kanade.tachiyomi.source.model.SManga
 import exh.metadata.forEach
+import exh.metadata.sql.models.SearchMetadata
 import exh.metadata.sql.models.SearchTag
 import exh.metadata.sql.models.SearchTitle
 import exh.plusAssign
@@ -69,13 +69,13 @@ abstract class RaisedSearchMetadata {
 
         val extra = raiseFlattenGson.toJson(this)
         return FlatMetadata(
-                SearchMetadata(
-                        mangaId,
-                        uploader,
-                        extra,
-                        indexedExtra,
-                        0
-                ),
+            SearchMetadata(
+                mangaId,
+                uploader,
+                extra,
+                indexedExtra,
+                0
+            ),
                 tags.map {
                     SearchTag(
                             null,
diff --git a/app/src/main/java/exh/metadata/sql/mappers/SearchMetadataTypeMapping.kt b/app/src/main/java/exh/metadata/sql/mappers/SearchMetadataTypeMapping.kt
index e5e7a2178..43ca0c31c 100755
--- a/app/src/main/java/exh/metadata/sql/mappers/SearchMetadataTypeMapping.kt
+++ b/app/src/main/java/exh/metadata/sql/mappers/SearchMetadataTypeMapping.kt
@@ -18,22 +18,22 @@ import exh.metadata.sql.tables.SearchMetadataTable.COL_UPLOADER
 import exh.metadata.sql.tables.SearchMetadataTable.TABLE
 
 class SearchMetadataTypeMapping : SQLiteTypeMapping<SearchMetadata>(
-        SearchMetadataPutResolver(),
-        SearchMetadataGetResolver(),
-        SearchMetadataDeleteResolver()
+    SearchMetadataPutResolver(),
+    SearchMetadataGetResolver(),
+    SearchMetadataDeleteResolver()
 )
 
 class SearchMetadataPutResolver : DefaultPutResolver<SearchMetadata>() {
 
     override fun mapToInsertQuery(obj: SearchMetadata) = InsertQuery.builder()
-            .table(TABLE)
-            .build()
+        .table(TABLE)
+        .build()
 
     override fun mapToUpdateQuery(obj: SearchMetadata) = UpdateQuery.builder()
-            .table(TABLE)
-            .where("$COL_MANGA_ID = ?")
-            .whereArgs(obj.mangaId)
-            .build()
+        .table(TABLE)
+        .where("$COL_MANGA_ID = ?")
+        .whereArgs(obj.mangaId)
+        .build()
 
     override fun mapToContentValues(obj: SearchMetadata) = ContentValues(5).apply {
         put(COL_MANGA_ID, obj.mangaId)
@@ -46,20 +46,21 @@ class SearchMetadataPutResolver : DefaultPutResolver<SearchMetadata>() {
 
 class SearchMetadataGetResolver : DefaultGetResolver<SearchMetadata>() {
 
-    override fun mapFromCursor(cursor: Cursor): SearchMetadata = SearchMetadata(
+    override fun mapFromCursor(cursor: Cursor): SearchMetadata =
+        SearchMetadata(
             mangaId = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID)),
             uploader = cursor.getString(cursor.getColumnIndex(COL_UPLOADER)),
             extra = cursor.getString(cursor.getColumnIndex(COL_EXTRA)),
             indexedExtra = cursor.getString(cursor.getColumnIndex(COL_INDEXED_EXTRA)),
             extraVersion = cursor.getInt(cursor.getColumnIndex(COL_EXTRA_VERSION))
-    )
+        )
 }
 
 class SearchMetadataDeleteResolver : DefaultDeleteResolver<SearchMetadata>() {
 
     override fun mapToDeleteQuery(obj: SearchMetadata) = DeleteQuery.builder()
-            .table(TABLE)
-            .where("$COL_MANGA_ID = ?")
-            .whereArgs(obj.mangaId)
-            .build()
+        .table(TABLE)
+        .where("$COL_MANGA_ID = ?")
+        .whereArgs(obj.mangaId)
+        .build()
 }
diff --git a/app/src/main/java/exh/search/SearchEngine.kt b/app/src/main/java/exh/search/SearchEngine.kt
index 54d4aa50d..8299d6628 100755
--- a/app/src/main/java/exh/search/SearchEngine.kt
+++ b/app/src/main/java/exh/search/SearchEngine.kt
@@ -1,6 +1,6 @@
 package exh.search
 
-import eu.kanade.tachiyomi.data.database.tables.SearchMetadataTable
+import exh.metadata.sql.tables.SearchMetadataTable
 import exh.metadata.sql.tables.SearchTagTable
 import exh.metadata.sql.tables.SearchTitleTable
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt b/app/src/main/java/exh/smartsearch/SmartSearchEngine.kt
similarity index 99%
rename from app/src/main/java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt
rename to app/src/main/java/exh/smartsearch/SmartSearchEngine.kt
index 6cd25571f..8e6002a68 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt
+++ b/app/src/main/java/exh/smartsearch/SmartSearchEngine.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.smartsearch
+package exh.smartsearch
 
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Manga
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/smartsearch/SmartSearchController.kt b/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt
similarity index 98%
rename from app/src/main/java/eu/kanade/tachiyomi/ui/smartsearch/SmartSearchController.kt
rename to app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt
index 94180f53c..025950e9f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/smartsearch/SmartSearchController.kt
+++ b/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.ui.smartsearch
+package exh.ui.smartsearch
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/smartsearch/SmartSearchPresenter.kt b/app/src/main/java/exh/ui/smartsearch/SmartSearchPresenter.kt
similarity index 95%
rename from app/src/main/java/eu/kanade/tachiyomi/ui/smartsearch/SmartSearchPresenter.kt
rename to app/src/main/java/exh/ui/smartsearch/SmartSearchPresenter.kt
index 4f388926d..15fc7e979 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/smartsearch/SmartSearchPresenter.kt
+++ b/app/src/main/java/exh/ui/smartsearch/SmartSearchPresenter.kt
@@ -1,12 +1,12 @@
-package eu.kanade.tachiyomi.ui.smartsearch
+package exh.ui.smartsearch
 
 import android.os.Bundle
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.smartsearch.SmartSearchEngine
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
 import eu.kanade.tachiyomi.ui.source.SourceController
+import exh.smartsearch.SmartSearchEngine
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers