From 02c15f896bd953f93c833c8d92947daaa47ddab8 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 15 Mar 2022 06:52:33 +0200
Subject: [PATCH] Move parsers out of project

---
 .idea/jarRepositories.xml                     |   5 +
 app/build.gradle                              |   5 +-
 .../java/org/koitharu/kotatsu/KotatsuApp.kt   |   4 +-
 .../base/domain/MangaDataRepository.kt        |   8 +-
 .../kotatsu/base/domain/MangaIntent.kt        |   7 +-
 .../kotatsu/base/domain/MangaLoaderContext.kt | 100 ------
 .../kotatsu/base/domain/MangaUtils.kt         |   4 +-
 .../kotatsu/core/backup/RestoreRepository.kt  |  20 +-
 .../core/db/DatabasePrePopulateCallback.kt    |   2 +-
 .../kotatsu/core/db/entity/MangaEntity.kt     |   8 +-
 .../kotatsu/core/db/entity/TagEntity.kt       |   8 +-
 .../core/db/migrations/Migration8To9.kt       |   2 +-
 .../core/exceptions/AuthRequiredException.kt  |  14 -
 .../CloudFlareProtectedException.kt           |   7 +-
 .../core/exceptions/GraphQLException.kt       |  14 -
 .../kotatsu/core/exceptions/ParseException.kt |   4 -
 .../exceptions/resolve/ExceptionResolver.kt   |  22 +-
 .../exceptions/resolve/ResolvableException.kt |   6 -
 .../kotatsu/core/github/GithubRepository.kt   |   4 +-
 .../kotatsu/core/model/FavouriteCategory.kt   |   1 +
 .../org/koitharu/kotatsu/core/model/Manga.kt  |  29 --
 .../kotatsu/core/model/MangaChapter.kt        |  21 --
 .../koitharu/kotatsu/core/model/MangaPage.kt  |  13 -
 .../kotatsu/core/model/MangaSource.kt         |  40 ---
 .../koitharu/kotatsu/core/model/MangaState.kt |   5 -
 .../koitharu/kotatsu/core/model/MangaTag.kt   |  11 -
 .../kotatsu/core/model/MangaTracking.kt       |   4 +-
 .../koitharu/kotatsu/core/model/SortOrder.kt  |  12 -
 .../kotatsu/core/model/TrackingLogItem.kt     |   4 +-
 .../core/model/parcelable/Parcelable.kt       |  91 ++++++
 .../core/model/parcelable/ParcelableManga.kt  |  29 ++
 .../parcelable/ParcelableMangaChapters.kt     |  36 ++
 .../model/parcelable/ParcelableMangaPages.kt  |  36 ++
 .../model/parcelable/ParcelableMangaTags.kt   |  36 ++
 .../kotatsu/core/network/NetworkModule.kt     |   5 +-
 .../kotatsu/core/os/ShortcutsRepository.kt    |   2 +-
 .../kotatsu/core/parser/FaviconMapper.kt      |   2 +-
 .../core/parser/MangaLoaderContextImpl.kt     |  53 +++
 .../kotatsu/core/parser/MangaRepository.kt    |  12 +-
 .../parser/MangaRepositoryAuthProvider.kt     |  10 -
 .../kotatsu/core/parser/ParserModule.kt       |  37 ---
 .../core/parser/RemoteMangaRepository.kt      |  92 ++----
 .../core/parser/site/AnibelRepository.kt      | 262 ---------------
 .../core/parser/site/BatoToRepository.kt      | 307 ------------------
 .../core/parser/site/ChanRepository.kt        | 163 ----------
 .../core/parser/site/ComickFunRepository.kt   | 212 ------------
 .../core/parser/site/DesuMeRepository.kt      | 149 ---------
 .../core/parser/site/ExHentaiRepository.kt    | 281 ----------------
 .../core/parser/site/GroupleRepository.kt     | 248 --------------
 .../core/parser/site/HenChanRepository.kt     |  59 ----
 .../core/parser/site/HentaiLibRepository.kt   |  14 -
 .../core/parser/site/MangaChanRepository.kt   |  10 -
 .../core/parser/site/MangaDexRepository.kt    | 216 ------------
 .../core/parser/site/MangaLibRepository.kt    | 274 ----------------
 .../core/parser/site/MangaOwlRepository.kt    | 169 ----------
 .../core/parser/site/MangaTownRepository.kt   | 222 -------------
 .../core/parser/site/MangareadRepository.kt   | 242 --------------
 .../core/parser/site/MintMangaRepository.kt   |  10 -
 .../core/parser/site/NineMangaRepository.kt   | 251 --------------
 .../core/parser/site/NudeMoonRepository.kt    | 225 -------------
 .../core/parser/site/ReadmangaRepository.kt   |  10 -
 .../core/parser/site/RemangaRepository.kt     | 258 ---------------
 .../core/parser/site/SelfMangaRepository.kt   |  10 -
 .../core/parser/site/YaoiChanRepository.kt    |  40 ---
 .../kotatsu/core/prefs/AppSettings.kt         |   2 +-
 .../kotatsu/core/prefs/SourceSettings.kt      |  25 +-
 .../org/koitharu/kotatsu/core/ui/SortOrder.kt |  15 +
 .../kotatsu/details/ui/ChaptersFragment.kt    |   2 +-
 .../kotatsu/details/ui/DetailsActivity.kt     |  10 +-
 .../kotatsu/details/ui/DetailsFragment.kt     |  15 +-
 .../kotatsu/details/ui/DetailsViewModel.kt    |   8 +-
 .../details/ui/model/ChapterListItem.kt       |   2 +-
 .../ui/model/ListModelConversionExt.kt        |   2 +-
 .../download/domain/DownloadManager.kt        |   4 +-
 .../ui/service/DownloadNotification.kt        |   2 +-
 .../download/ui/service/DownloadService.kt    |   9 +-
 .../data/FavouriteCategoryEntity.kt           |   2 +-
 .../kotatsu/favourites/data/FavouritesDao.kt  |   2 +-
 .../favourites/domain/FavouritesRepository.kt |   4 +-
 .../ui/FavouritesContainerFragment.kt         |   3 +-
 .../ui/categories/CategoriesActivity.kt       |   3 +-
 .../FavouritesCategoriesViewModel.kt          |   2 +-
 .../select/FavouriteCategoriesDialog.kt       |   7 +-
 .../select/MangaCategoriesViewModel.kt        |   2 +-
 .../ui/list/FavouritesListFragment.kt         |   2 +-
 .../ui/list/FavouritesListViewModel.kt        |   4 +-
 .../history/domain/HistoryRepository.kt       |   4 +-
 .../history/domain/MangaWithHistory.kt        |   2 +-
 .../kotatsu/history/ui/HistoryListFragment.kt |   4 +-
 .../history/ui/HistoryListViewModel.kt        |   2 +-
 .../kotatsu/list/domain/AvailableFilters.kt   |  30 --
 .../kotatsu/list/ui/MangaListFragment.kt      |   8 +-
 .../kotatsu/list/ui/MangaListViewModel.kt     |   2 +-
 .../list/ui/adapter/CurrentFilterAD.kt        |   2 +-
 .../kotatsu/list/ui/adapter/ListHeaderAD.kt   |   1 +
 .../list/ui/adapter/MangaGridItemAD.kt        |   2 +-
 .../ui/adapter/MangaListDetailedItemAD.kt     |   2 +-
 .../list/ui/adapter/MangaListItemAD.kt        |   2 +-
 .../list/ui/adapter/MangaListListener.kt      |   4 +-
 .../list/ui/filter/FilterAdapterDelegates.kt  |   1 +
 .../list/ui/filter/FilterCoordinator.kt       |   2 +-
 .../kotatsu/list/ui/filter/FilterItem.kt      |   4 +-
 .../kotatsu/list/ui/filter/FilterState.kt     |   9 +-
 .../kotatsu/list/ui/model/ListHeader.kt       |   2 +-
 .../list/ui/model/ListModelConversionExt.kt   |   9 +-
 .../kotatsu/list/ui/model/MangaGridModel.kt   |   2 +-
 .../list/ui/model/MangaListDetailedModel.kt   |   2 +-
 .../kotatsu/list/ui/model/MangaListModel.kt   |   2 +-
 .../org/koitharu/kotatsu/local/LocalModule.kt |   2 +-
 .../koitharu/kotatsu/local/data/MangaIndex.kt |  16 +-
 .../koitharu/kotatsu/local/data/MangaZip.kt   |   6 +-
 .../koitharu/kotatsu/local/data/PagesCache.kt |   2 +-
 .../local/domain/LocalMangaRepository.kt      |   6 +-
 .../kotatsu/local/ui/LocalListFragment.kt     |   4 +-
 .../kotatsu/local/ui/LocalListViewModel.kt    |   4 +-
 .../koitharu/kotatsu/main/ui/MainActivity.kt  |  10 +-
 .../koitharu/kotatsu/main/ui/MainViewModel.kt |   2 +-
 .../main/ui/protect/ProtectViewModel.kt       |   2 +-
 .../kotatsu/reader/domain/PageLoader.kt       |   9 +-
 .../kotatsu/reader/ui/ChaptersBottomSheet.kt  |   7 +-
 .../kotatsu/reader/ui/ReaderActivity.kt       |  20 +-
 .../koitharu/kotatsu/reader/ui/ReaderState.kt |   2 +-
 .../kotatsu/reader/ui/ReaderViewModel.kt      |   6 +-
 .../reader/ui/SimpleSettingsActivity.kt       |   4 +-
 .../reader/ui/pager/PageHolderDelegate.kt     |   8 +-
 .../kotatsu/reader/ui/pager/ReaderPage.kt     |   4 +-
 .../reader/ui/pager/standard/PageHolder.kt    |   4 +-
 .../reader/ui/pager/webtoon/WebtoonHolder.kt  |   4 +-
 .../ui/pager/webtoon/WebtoonImageView.kt      |   2 +-
 .../ui/thumbnails/OnPageSelectListener.kt     |   2 +-
 .../reader/ui/thumbnails/PageThumbnail.kt     |   2 +-
 .../ui/thumbnails/PagesThumbnailsSheet.kt     |  11 +-
 .../ui/thumbnails/adapter/PageThumbnailAD.kt  |   2 +-
 .../adapter/PageThumbnailAdapter.kt           |   2 +-
 .../kotatsu/remotelist/RemoteListModule.kt    |   2 +-
 .../remotelist/ui/RemoteListFragment.kt       |   8 +-
 .../remotelist/ui/RemoteListViewModel.kt      |  10 +-
 .../koitharu/kotatsu/search/SearchModule.kt   |   5 +-
 .../search/domain/MangaSearchRepository.kt    |  12 +-
 .../kotatsu/search/ui/MangaListActivity.kt    |  21 +-
 .../kotatsu/search/ui/SearchActivity.kt       |   2 +-
 .../kotatsu/search/ui/SearchFragment.kt       |   8 +-
 .../kotatsu/search/ui/SearchViewModel.kt      |   4 +-
 .../search/ui/global/GlobalSearchViewModel.kt |   2 +-
 .../ui/suggestion/SearchSuggestionListener.kt |   4 +-
 .../suggestion/SearchSuggestionViewModel.kt   |   4 +-
 .../adapter/SearchSuggestionTagsAD.kt         |   2 +-
 .../adapter/SearchSuggestionsMangaListAD.kt   |   2 +-
 .../suggestion/model/SearchSuggestionItem.kt  |   4 +-
 .../kotatsu/settings/AppUpdateChecker.kt      |   2 +-
 .../kotatsu/settings/MainSettingsFragment.kt  |   2 +-
 .../kotatsu/settings/SettingsActivity.kt      |   2 +-
 .../settings/SourceSettingsFragment.kt        |  22 +-
 .../settings/onboard/OnboardViewModel.kt      |   4 +-
 .../settings/protect/ProtectSetupViewModel.kt |   2 +-
 .../sources/SourcesSettingsViewModel.kt       |   4 +-
 .../sources/auth/SourceAuthActivity.kt        |  17 +-
 .../sources/model/SourceConfigItem.kt         |   2 +-
 .../suggestions/domain/MangaSuggestion.kt     |   2 +-
 .../domain/SuggestionRepository.kt            |   2 +-
 .../suggestions/ui/SuggestionsWorker.kt       |  10 +-
 .../tracker/domain/TrackingRepository.kt      |   6 +-
 .../kotatsu/tracker/ui/FeedFragment.kt        |   4 +-
 .../kotatsu/tracker/ui/adapter/FeedItemAD.kt  |   2 +-
 .../kotatsu/tracker/ui/model/FeedItem.kt      |   2 +-
 .../kotatsu/tracker/work/TrackWorker.kt       |   8 +-
 .../kotatsu/utils/DownloadManagerHelper.kt    |   4 +-
 .../org/koitharu/kotatsu/utils/ShareHelper.kt |   2 +-
 .../koitharu/kotatsu/utils/ext/AndroidExt.kt  |  21 +-
 .../kotatsu/utils/ext/CollectionExt.kt        |  59 ++--
 .../koitharu/kotatsu/utils/ext/CommonExt.kt   |   7 +-
 .../kotatsu/utils/ext/CookieJarExt.kt         |  37 ---
 .../org/koitharu/kotatsu/utils/ext/DateExt.kt |   4 -
 .../org/koitharu/kotatsu/utils/ext/FlowExt.kt |   6 -
 .../koitharu/kotatsu/utils/ext/FragmentExt.kt |  24 +-
 .../org/koitharu/kotatsu/utils/ext/HttpExt.kt |  35 --
 .../koitharu/kotatsu/utils/ext/IteratorExt.kt |  21 --
 .../org/koitharu/kotatsu/utils/ext/JsonExt.kt |  99 ------
 .../org/koitharu/kotatsu/utils/ext/KoinExt.kt |  19 --
 .../koitharu/kotatsu/utils/ext/LiveDataExt.kt |  10 -
 .../koitharu/kotatsu/utils/ext/LocaleExt.kt   |   8 +-
 .../koitharu/kotatsu/utils/ext/ParseExt.kt    | 109 -------
 .../kotatsu/utils/ext/PrimitiveExt.kt         |  18 +-
 .../koitharu/kotatsu/utils/ext/StringExt.kt   | 240 --------------
 .../org/koitharu/kotatsu/utils/ext/ViewExt.kt |  54 ---
 .../kotatsu/utils/json/JSONIterator.kt        |  14 -
 .../kotatsu/utils/json/JSONStringIterator.kt  |  13 -
 .../kotatsu/utils/json/JsonValuesIterator.kt  |  17 -
 .../koitharu/kotatsu/widget/WidgetUpdater.kt  |   2 +-
 .../widget/recent/RecentListFactory.kt        |   2 +-
 .../kotatsu/widget/shelf/ShelfListFactory.kt  |   2 +-
 .../kotatsu/core/network/TestCookieJar.kt     |  27 --
 .../core/parser/RemoteMangaRepositoryTest.kt  | 128 --------
 .../core/parser/RepositoryTestModule.kt       |  39 ---
 .../kotatsu/core/parser/SourceSettingsStub.kt |  10 -
 .../koitharu/kotatsu/utils/TestResponse.kt    |  32 --
 .../org/koitharu/kotatsu/utils/TruthExt.kt    |  13 -
 197 files changed, 710 insertions(+), 5374 deletions(-)
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/base/domain/MangaLoaderContext.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/exceptions/AuthRequiredException.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/exceptions/GraphQLException.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/exceptions/ParseException.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ResolvableException.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/model/MangaChapter.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/model/MangaPage.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/model/MangaState.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/model/MangaTag.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/model/SortOrder.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepositoryAuthProvider.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/ParserModule.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/AnibelRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/BatoToRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/DesuMeRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/ExHentaiRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/HentaiLibRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaChanRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaDexRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaOwlRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/MintMangaRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/NudeMoonRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/ReadmangaRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/RemangaRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/SelfMangaRepository.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/parser/site/YaoiChanRepository.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/ui/SortOrder.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/list/domain/AvailableFilters.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/ext/CookieJarExt.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/ext/HttpExt.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/ext/IteratorExt.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/ext/JsonExt.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/ext/KoinExt.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/ext/ParseExt.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/ext/StringExt.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/json/JSONIterator.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/json/JSONStringIterator.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/json/JsonValuesIterator.kt
 delete mode 100644 app/src/test/java/org/koitharu/kotatsu/core/network/TestCookieJar.kt
 delete mode 100644 app/src/test/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepositoryTest.kt
 delete mode 100644 app/src/test/java/org/koitharu/kotatsu/core/parser/RepositoryTestModule.kt
 delete mode 100644 app/src/test/java/org/koitharu/kotatsu/core/parser/SourceSettingsStub.kt
 delete mode 100644 app/src/test/java/org/koitharu/kotatsu/utils/TestResponse.kt
 delete mode 100644 app/src/test/java/org/koitharu/kotatsu/utils/TruthExt.kt

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index bcabc0089..8ce1bb2e4 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -36,5 +36,10 @@
       <option name="name" value="MavenRepo" />
       <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://maven.pkg.github.com/nv95/kotatsu-parsers" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 451235f9e..300eb487a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -66,6 +66,8 @@ android {
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+	implementation 'com.github.nv95:kotatsu-parsers:master-SNAPSHOT'
+
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
 
@@ -93,7 +95,6 @@ dependencies {
 
 	implementation 'com.squareup.okhttp3:okhttp:4.9.3'
 	implementation 'com.squareup.okio:okio:3.0.0'
-	implementation 'org.jsoup:jsoup:1.14.3'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.1'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.1'
@@ -106,9 +107,7 @@ dependencies {
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'com.google.truth:truth:1.1.3'
 	testImplementation 'org.json:json:20211205'
-	testImplementation 'io.webfolder:quickjs:1.1.0'
 	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0'
 	testImplementation 'io.insert-koin:koin-test-junit4:3.1.5'
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
index aca66f9b9..0111f7255 100644
--- a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
@@ -7,11 +7,9 @@ import androidx.fragment.app.strictmode.FragmentStrictMode
 import org.koin.android.ext.android.get
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
 import org.koitharu.kotatsu.core.db.databaseModule
 import org.koitharu.kotatsu.core.github.githubModule
 import org.koitharu.kotatsu.core.network.networkModule
-import org.koitharu.kotatsu.core.parser.parserModule
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.AppCrashHandler
 import org.koitharu.kotatsu.core.ui.uiModule
@@ -23,6 +21,7 @@ import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.local.localModule
 import org.koitharu.kotatsu.main.mainModule
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.reader.readerModule
 import org.koitharu.kotatsu.remotelist.remoteListModule
 import org.koitharu.kotatsu.search.searchModule
@@ -56,7 +55,6 @@ class KotatsuApp : Application() {
 				databaseModule,
 				githubModule,
 				uiModule,
-				parserModule,
 				mainModule,
 				searchModule,
 				localModule,
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt
index e51857f55..a658a474a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt
@@ -5,10 +5,10 @@ import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.core.prefs.ReaderMode
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.utils.ext.mapToSet
 
 class MangaDataRepository(private val db: MangaDatabase) {
@@ -37,7 +37,7 @@ class MangaDataRepository(private val db: MangaDatabase) {
 
 	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
 		intent.manga != null -> intent.manga
-		intent.mangaId != MangaIntent.ID_NONE -> db.mangaDao.find(intent.mangaId)?.toManga()
+		intent.mangaId != 0L -> db.mangaDao.find(intent.mangaId)?.toManga()
 		else -> null // TODO resolve uri
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt
index cfd7d7b4f..fccd1e9fd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt
@@ -3,7 +3,8 @@ package org.koitharu.kotatsu.base.domain
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.parsers.model.Manga
 
 class MangaIntent private constructor(
 	val manga: Manga?,
@@ -12,13 +13,13 @@ class MangaIntent private constructor(
 ) {
 
 	constructor(intent: Intent?) : this(
-		manga = intent?.getParcelableExtra(KEY_MANGA),
+		manga = intent?.getParcelableExtra<ParcelableManga>(KEY_MANGA)?.manga,
 		mangaId = intent?.getLongExtra(KEY_ID, ID_NONE) ?: ID_NONE,
 		uri = intent?.data
 	)
 
 	constructor(args: Bundle?) : this(
-		manga = args?.getParcelable(KEY_MANGA),
+		manga = args?.getParcelable<ParcelableManga>(KEY_MANGA)?.manga,
 		mangaId = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,
 		uri = null
 	)
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaLoaderContext.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaLoaderContext.kt
deleted file mode 100644
index eb941a696..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaLoaderContext.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import android.annotation.SuppressLint
-import android.webkit.WebView
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import okhttp3.*
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.RequestBody.Companion.toRequestBody
-import org.json.JSONObject
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-import org.koitharu.kotatsu.core.exceptions.GraphQLException
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.prefs.SourceSettings
-import org.koitharu.kotatsu.utils.ext.await
-import org.koitharu.kotatsu.utils.ext.parseJson
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-open class MangaLoaderContext(
-	private val okHttp: OkHttpClient,
-	val cookieJar: CookieJar,
-) : KoinComponent {
-
-	suspend fun httpGet(url: String, headers: Headers? = null): Response {
-		val request = Request.Builder()
-			.get()
-			.url(url)
-		if (headers != null) {
-			request.headers(headers)
-		}
-		return okHttp.newCall(request.build()).await()
-	}
-
-	suspend fun httpPost(
-		url: String,
-		form: Map<String, String>,
-	): Response {
-		val body = FormBody.Builder()
-		form.forEach { (k, v) ->
-			body.addEncoded(k, v)
-		}
-		val request = Request.Builder()
-			.post(body.build())
-			.url(url)
-		return okHttp.newCall(request.build()).await()
-	}
-
-	suspend fun httpPost(
-		url: String,
-		payload: String,
-	): Response {
-		val body = FormBody.Builder()
-		payload.split('&').forEach {
-			val pos = it.indexOf('=')
-			if (pos != -1) {
-				val k = it.substring(0, pos)
-				val v = it.substring(pos + 1)
-				body.addEncoded(k, v)
-			}
-		}
-		val request = Request.Builder()
-			.post(body.build())
-			.url(url)
-		return okHttp.newCall(request.build()).await()
-	}
-
-	suspend fun graphQLQuery(endpoint: String, query: String): JSONObject {
-		val body = JSONObject()
-		body.put("operationName", null)
-		body.put("variables", JSONObject())
-		body.put("query", "{${query}}")
-		val mediaType = "application/json; charset=utf-8".toMediaType()
-		val requestBody = body.toString().toRequestBody(mediaType)
-		val request = Request.Builder()
-			.post(requestBody)
-			.url(endpoint)
-		val json = okHttp.newCall(request.build()).await().parseJson()
-		json.optJSONArray("errors")?.let {
-			if (it.length() != 0) {
-				throw GraphQLException(it)
-			}
-		}
-		return json
-	}
-
-	@SuppressLint("SetJavaScriptEnabled")
-	open suspend fun evaluateJs(script: String): String? = withContext(Dispatchers.Main) {
-		val webView = WebView(get())
-		webView.settings.javaScriptEnabled = true
-		suspendCoroutine { cont ->
-			webView.evaluateJavascript(script) { result ->
-				cont.resume(result?.takeUnless { it == "null" })
-			}
-		}
-	}
-
-	open fun getSettings(source: MangaSource) = SourceSettings(get(), source)
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
index 52956c902..9ed4e714b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
@@ -10,10 +10,10 @@ import okhttp3.Request
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.model.MangaPage
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.utils.ext.await
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.utils.ext.medianOrNull
 import java.io.InputStream
 import java.util.zip.ZipFile
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
index 9626ddb13..ba4a8b6a3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
@@ -5,23 +5,23 @@ import org.json.JSONObject
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.history.data.HistoryEntity
-import org.koitharu.kotatsu.utils.ext.getBooleanOrDefault
-import org.koitharu.kotatsu.utils.ext.getStringOrNull
-import org.koitharu.kotatsu.utils.ext.iterator
-import org.koitharu.kotatsu.utils.ext.map
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.json.JSONIterator
+import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
+import org.koitharu.kotatsu.parsers.util.json.mapJSON
 
 class RestoreRepository(private val db: MangaDatabase) {
 
 	suspend fun upsertHistory(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
-		for (item in entry.data) {
+		for (item in entry.data.JSONIterator()) {
 			val mangaJson = item.getJSONObject("manga")
 			val manga = parseManga(mangaJson)
-			val tags = mangaJson.getJSONArray("tags").map {
+			val tags = mangaJson.getJSONArray("tags").mapJSON {
 				parseTag(it)
 			}
 			val history = parseHistory(item)
@@ -38,7 +38,7 @@ class RestoreRepository(private val db: MangaDatabase) {
 
 	suspend fun upsertCategories(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
-		for (item in entry.data) {
+		for (item in entry.data.JSONIterator()) {
 			val category = parseCategory(item)
 			result += runCatching {
 				db.favouriteCategoriesDao.upsert(category)
@@ -49,10 +49,10 @@ class RestoreRepository(private val db: MangaDatabase) {
 
 	suspend fun upsertFavourites(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
-		for (item in entry.data) {
+		for (item in entry.data.JSONIterator()) {
 			val mangaJson = item.getJSONObject("manga")
 			val manga = parseManga(mangaJson)
-			val tags = mangaJson.getJSONArray("tags").map {
+			val tags = mangaJson.getJSONArray("tags").mapJSON {
 				parseTag(it)
 			}
 			val favourite = parseFavourite(item)
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
index 79d0fbd34..35c52192c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
@@ -4,7 +4,7 @@ import android.content.res.Resources
 import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder
 
 class DatabasePrePopulateCallback(private val resources: Resources) : RoomDatabase.Callback() {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
index 25ec915a3..6716cfafd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
@@ -3,10 +3,10 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaState
-import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaState
+import org.koitharu.kotatsu.parsers.model.MangaTag
 
 @Entity(tableName = "manga")
 class MangaEntity(
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
index 6b3b6a94b..150715f4a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
@@ -3,10 +3,10 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.utils.ext.longHashCode
-import org.koitharu.kotatsu.utils.ext.toTitleCase
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.util.longHashCode
+import org.koitharu.kotatsu.parsers.util.toTitleCase
 
 @Entity(tableName = "tags")
 class TagEntity(
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration8To9.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration8To9.kt
index 84eedc797..768acf7d4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration8To9.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration8To9.kt
@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.core.db.migrations
 
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder
 
 class Migration8To9 : Migration(8, 9) {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/AuthRequiredException.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/AuthRequiredException.kt
deleted file mode 100644
index 90a40c050..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/AuthRequiredException.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class AuthRequiredException(
-	val source: MangaSource,
-) : RuntimeException("Authorization required"), ResolvableException {
-
-	@StringRes
-	override val resolveTextId: Int = R.string.sign_in
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
index e02f16da1..5a8cd055c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
@@ -3,12 +3,7 @@ package org.koitharu.kotatsu.core.exceptions
 import androidx.annotation.StringRes
 import okio.IOException
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
 
 class CloudFlareProtectedException(
 	val url: String
-) : IOException("Protected by CloudFlare"), ResolvableException {
-
-	@StringRes
-	override val resolveTextId: Int = R.string.captcha_solve
-}
\ No newline at end of file
+) : IOException("Protected by CloudFlare")
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/GraphQLException.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/GraphQLException.kt
deleted file mode 100644
index 92cdb325f..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/GraphQLException.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import org.json.JSONArray
-import org.koitharu.kotatsu.utils.ext.map
-
-class GraphQLException(private val errors: JSONArray) : RuntimeException() {
-
-	val messages = errors.map {
-		it.getString("message")
-	}
-
-	override val message: String
-		get() = messages.joinToString("\n")
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/ParseException.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/ParseException.kt
deleted file mode 100644
index 2a2bb64dc..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/ParseException.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-class ParseException(message: String? = null, cause: Throwable? = null) :
-	RuntimeException(message, cause)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt
index efad58757..50f991b47 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt
@@ -3,13 +3,15 @@ package org.koitharu.kotatsu.core.exceptions.resolve
 import android.util.ArrayMap
 import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.ActivityResultLauncher
+import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import kotlinx.coroutines.suspendCancellableCoroutine
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
-import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
 import org.koitharu.kotatsu.utils.TaggedActivityResult
 import org.koitharu.kotatsu.utils.isSuccess
@@ -20,7 +22,7 @@ import kotlin.coroutines.suspendCoroutine
 class ExceptionResolver private constructor(
 	private val activity: FragmentActivity?,
 	private val fragment: Fragment?,
-): ActivityResultCallback<TaggedActivityResult> {
+) : ActivityResultCallback<TaggedActivityResult> {
 
 	private val continuations = ArrayMap<String, Continuation<Boolean>>(1)
 	private lateinit var sourceAuthContract: ActivityResultLauncher<MangaSource>
@@ -38,7 +40,7 @@ class ExceptionResolver private constructor(
 		continuations.remove(result.tag)?.resume(result.isSuccess)
 	}
 
-	suspend fun resolve(e: ResolvableException): Boolean = when (e) {
+	suspend fun resolve(e: Throwable): Boolean = when (e) {
 		is CloudFlareProtectedException -> resolveCF(e.url)
 		is AuthRequiredException -> resolveAuthException(e.source)
 		else -> false
@@ -68,4 +70,16 @@ class ExceptionResolver private constructor(
 	}
 
 	private fun getFragmentManager() = checkNotNull(fragment?.childFragmentManager ?: activity?.supportFragmentManager)
+
+	companion object {
+
+		@StringRes
+		fun getResolveStringId(e: Throwable) = when (e) {
+			is CloudFlareProtectedException -> R.string.captcha_solve
+			is AuthRequiredException -> R.string.sign_in
+			else -> 0
+		}
+
+		fun canResolve(e: Throwable) = getResolveStringId(e) != 0
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ResolvableException.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ResolvableException.kt
deleted file mode 100644
index 6ea802b61..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ResolvableException.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions.resolve
-
-interface ResolvableException {
-
-	val resolveTextId: Int
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
index b7b3e110e..8b9f4e793 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.core.github
 
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.koitharu.kotatsu.utils.ext.await
-import org.koitharu.kotatsu.utils.ext.parseJson
+import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.parsers.util.parseJson
 
 class GithubRepository(private val okHttp: OkHttpClient) {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
index 6998a1a08..655a0eb08 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.util.*
 
 @Parcelize
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt
deleted file mode 100644
index f631d2d9d..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class Manga(
-	val id: Long,
-	val title: String,
-	val altTitle: String? = null,
-	val url: String, // relative url for internal use
-	val publicUrl: String,
-	val rating: Float = NO_RATING, //normalized value [0..1] or -1
-	val isNsfw: Boolean = false,
-	val coverUrl: String,
-	val largeCoverUrl: String? = null,
-	val description: String? = null, //HTML
-	val tags: Set<MangaTag> = emptySet(),
-	val state: MangaState? = null,
-	val author: String? = null,
-	val chapters: List<MangaChapter>? = null,
-	val source: MangaSource
-) : Parcelable {
-
-	companion object {
-
-		const val NO_RATING = -1f
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaChapter.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaChapter.kt
deleted file mode 100644
index 9b0533722..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaChapter.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class MangaChapter(
-	val id: Long,
-	val name: String,
-	val number: Int,
-	val url: String,
-	val scanlator: String?,
-	val uploadDate: Long,
-	val branch: String?,
-	val source: MangaSource,
-) : Parcelable, Comparable<MangaChapter> {
-
-	override fun compareTo(other: MangaChapter): Int {
-		return number.compareTo(other.number)
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaPage.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaPage.kt
deleted file mode 100644
index 7576e2da4..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaPage.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class MangaPage(
-	val id: Long,
-	val url: String,
-	val referer: String,
-	val preview: String?,
-	val source: MangaSource,
-) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt
deleted file mode 100644
index 2733a422a..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Suppress("SpellCheckingInspection")
-@Parcelize
-enum class MangaSource(
-	val title: String,
-	val locale: String?,
-) : Parcelable {
-	LOCAL("Local", null),
-	READMANGA_RU("ReadManga", "ru"),
-	MINTMANGA("MintManga", "ru"),
-	SELFMANGA("SelfManga", "ru"),
-	MANGACHAN("Манга-тян", "ru"),
-	DESUME("Desu.me", "ru"),
-	HENCHAN("Хентай-тян", "ru"),
-	YAOICHAN("Яой-тян", "ru"),
-	MANGATOWN("MangaTown", "en"),
-	MANGALIB("MangaLib", "ru"),
-	NUDEMOON("Nude-Moon", "ru"),
-	MANGAREAD("MangaRead", "en"),
-	REMANGA("Remanga", "ru"),
-	HENTAILIB("HentaiLib", "ru"),
-	ANIBEL("Anibel", "be"),
-	NINEMANGA_EN("NineManga English", "en"),
-	NINEMANGA_ES("NineManga Español", "es"),
-	NINEMANGA_RU("NineManga Русский", "ru"),
-	NINEMANGA_DE("NineManga Deutsch", "de"),
-	NINEMANGA_IT("NineManga Italiano", "it"),
-	NINEMANGA_BR("NineManga Brasil", "pt"),
-	NINEMANGA_FR("NineManga Français", "fr"),
-	EXHENTAI("ExHentai", null),
-	MANGAOWL("MangaOwl", "en"),
-	MANGADEX("MangaDex", null),
-	BATOTO("Bato.To", null),
-	COMICK_FUN("ComicK", null),
-	;
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaState.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaState.kt
deleted file mode 100644
index caca2af4f..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaState.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-enum class MangaState {
-	ONGOING, FINISHED
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTag.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTag.kt
deleted file mode 100644
index fe10cb690..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTag.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class MangaTag(
-	val title: String,
-	val key: String,
-	val source: MangaSource,
-) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTracking.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTracking.kt
index c336599cc..77fdc5925 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTracking.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTracking.kt
@@ -2,13 +2,13 @@ package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.parsers.model.Manga
 import java.util.*
 
-@Parcelize
 data class MangaTracking(
 	val manga: Manga,
 	val knownChaptersCount: Int,
 	val lastChapterId: Long,
 	val lastNotifiedChapterId: Long,
 	val lastCheck: Date?
-) : Parcelable
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/SortOrder.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/SortOrder.kt
deleted file mode 100644
index 99ee3b835..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/SortOrder.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.R
-
-enum class SortOrder(@StringRes val titleRes: Int) {
-	UPDATED(R.string.updated),
-	POPULARITY(R.string.popular),
-	RATING(R.string.by_rating),
-	NEWEST(R.string.newest),
-	ALPHABETICAL(R.string.by_name)
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/TrackingLogItem.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/TrackingLogItem.kt
index ccb69b081..23a922cb6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/TrackingLogItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/TrackingLogItem.kt
@@ -2,12 +2,12 @@ package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.parsers.model.Manga
 import java.util.*
 
-@Parcelize
 data class TrackingLogItem(
 	val id: Long,
 	val manga: Manga,
 	val chapters: List<String>,
 	val createdAt: Date
-) : Parcelable
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt
new file mode 100644
index 000000000..7b74c329c
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt
@@ -0,0 +1,91 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import androidx.core.os.ParcelCompat
+import org.koitharu.kotatsu.parsers.model.*
+
+fun Manga.writeToParcel(out: Parcel, flags: Int) {
+	out.writeLong(id)
+	out.writeString(title)
+	out.writeString(altTitle)
+	out.writeString(url)
+	out.writeString(publicUrl)
+	out.writeFloat(rating)
+	ParcelCompat.writeBoolean(out, isNsfw)
+	out.writeString(coverUrl)
+	out.writeString(largeCoverUrl)
+	out.writeString(description)
+	out.writeParcelable(ParcelableMangaTags(tags), flags)
+	out.writeSerializable(state)
+	out.writeString(author)
+	out.writeParcelable(chapters?.let(::ParcelableMangaChapters), flags)
+	out.writeSerializable(source)
+}
+
+fun Parcel.readManga() = Manga(
+	id = readLong(),
+	title = requireNotNull(readString()),
+	altTitle = readString(),
+	url = requireNotNull(readString()),
+	publicUrl = requireNotNull(readString()),
+	rating = readFloat(),
+	isNsfw = ParcelCompat.readBoolean(this),
+	coverUrl = requireNotNull(readString()),
+	largeCoverUrl = readString(),
+	description = readString(),
+	tags = requireNotNull(readParcelable<ParcelableMangaTags>(ParcelableMangaTags::class.java.classLoader)).tags,
+	state = readSerializable() as MangaState?,
+	author = readString(),
+	chapters = readParcelable<ParcelableMangaChapters>(ParcelableMangaChapters::class.java.classLoader)?.chapters,
+	source = readSerializable() as MangaSource,
+)
+
+fun MangaPage.writeToParcel(out: Parcel) {
+	out.writeLong(id)
+	out.writeString(url)
+	out.writeString(referer)
+	out.writeString(preview)
+	out.writeSerializable(source)
+}
+
+fun Parcel.readMangaPage() = MangaPage(
+	id = readLong(),
+	url = requireNotNull(readString()),
+	referer = requireNotNull(readString()),
+	preview = readString(),
+	source = readSerializable() as MangaSource,
+)
+
+fun MangaChapter.writeToParcel(out: Parcel) {
+	out.writeLong(id)
+	out.writeString(name)
+	out.writeInt(number)
+	out.writeString(url)
+	out.writeString(scanlator)
+	out.writeLong(uploadDate)
+	out.writeString(branch)
+	out.writeSerializable(source)
+}
+
+fun Parcel.readMangaChapter() = MangaChapter(
+	id = readLong(),
+	name = requireNotNull(readString()),
+	number = readInt(),
+	url = requireNotNull(readString()),
+	scanlator = readString(),
+	uploadDate = readLong(),
+	branch = readString(),
+	source = readSerializable() as MangaSource,
+)
+
+fun MangaTag.writeToParcel(out: Parcel) {
+	out.writeString(title)
+	out.writeString(key)
+	out.writeSerializable(source)
+}
+
+fun Parcel.readMangaTag() = MangaTag(
+	title = requireNotNull(readString()),
+	key = requireNotNull(readString()),
+	source = readSerializable() as MangaSource,
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
new file mode 100644
index 000000000..08eaf40cc
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
@@ -0,0 +1,29 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import org.koitharu.kotatsu.parsers.model.Manga
+
+class ParcelableManga(
+	val manga: Manga,
+): Parcelable {
+	constructor(parcel: Parcel) : this(parcel.readManga())
+
+	override fun writeToParcel(parcel: Parcel, flags: Int) {
+		manga.writeToParcel(parcel, flags)
+	}
+
+	override fun describeContents(): Int {
+		return 0
+	}
+
+	companion object CREATOR : Parcelable.Creator<ParcelableManga> {
+		override fun createFromParcel(parcel: Parcel): ParcelableManga {
+			return ParcelableManga(parcel)
+		}
+
+		override fun newArray(size: Int): Array<ParcelableManga?> {
+			return arrayOfNulls(size)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt
new file mode 100644
index 000000000..db9ebb9c7
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt
@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.utils.ext.createList
+
+class ParcelableMangaChapters(
+	val chapters: List<MangaChapter>,
+) : Parcelable {
+
+	constructor(parcel: Parcel) : this(
+		createList(parcel.readInt()) { parcel.readMangaChapter() }
+	)
+
+	override fun writeToParcel(parcel: Parcel, flags: Int) {
+		parcel.writeInt(chapters.size)
+		for (chapter in chapters) {
+			chapter.writeToParcel(parcel)
+		}
+	}
+
+	override fun describeContents(): Int {
+		return 0
+	}
+
+	companion object CREATOR : Parcelable.Creator<ParcelableMangaChapters> {
+		override fun createFromParcel(parcel: Parcel): ParcelableMangaChapters {
+			return ParcelableMangaChapters(parcel)
+		}
+
+		override fun newArray(size: Int): Array<ParcelableMangaChapters?> {
+			return arrayOfNulls(size)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt
new file mode 100644
index 000000000..4717132f5
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt
@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.utils.ext.createList
+
+class ParcelableMangaPages(
+	val pages: List<MangaPage>,
+) : Parcelable {
+
+	constructor(parcel: Parcel) : this(
+		createList(parcel.readInt()) { parcel.readMangaPage() }
+	)
+
+	override fun writeToParcel(parcel: Parcel, flags: Int) {
+		parcel.writeInt(pages.size)
+		for (page in pages) {
+			page.writeToParcel(parcel)
+		}
+	}
+
+	override fun describeContents(): Int {
+		return 0
+	}
+
+	companion object CREATOR : Parcelable.Creator<ParcelableMangaPages> {
+		override fun createFromParcel(parcel: Parcel): ParcelableMangaPages {
+			return ParcelableMangaPages(parcel)
+		}
+
+		override fun newArray(size: Int): Array<ParcelableMangaPages?> {
+			return arrayOfNulls(size)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt
new file mode 100644
index 000000000..0ef0f74e0
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt
@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.utils.ext.createSet
+
+class ParcelableMangaTags(
+	val tags: Set<MangaTag>,
+) : Parcelable {
+
+	constructor(parcel: Parcel) : this(
+		createSet(parcel.readInt()) { parcel.readMangaTag() }
+	)
+
+	override fun writeToParcel(parcel: Parcel, flags: Int) {
+		parcel.writeInt(tags.size)
+		for (tag in tags) {
+			tag.writeToParcel(parcel)
+		}
+	}
+
+	override fun describeContents(): Int {
+		return 0
+	}
+
+	companion object CREATOR : Parcelable.Creator<ParcelableMangaTags> {
+		override fun createFromParcel(parcel: Parcel): ParcelableMangaTags {
+			return ParcelableMangaTags(parcel)
+		}
+
+		override fun newArray(size: Int): Array<ParcelableMangaTags?> {
+			return arrayOfNulls(size)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
index 69e1e411a..8ba1c6358 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
@@ -5,8 +5,9 @@ import okhttp3.OkHttpClient
 import org.koin.dsl.bind
 import org.koin.dsl.module
 import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
+import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
 import org.koitharu.kotatsu.local.data.LocalStorageManager
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.utils.DownloadManagerHelper
 import java.util.concurrent.TimeUnit
 
@@ -28,5 +29,5 @@ val networkModule
 			}.build()
 		}
 		factory { DownloadManagerHelper(get(), get()) }
-		single { MangaLoaderContext(get(), get()) }
+		single<MangaLoaderContext> { MangaLoaderContextImpl(get(), get(), get()) }
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
index d8c3db0c4..b2e9deba5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
@@ -15,8 +15,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.utils.ext.requireBitmap
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
index 44f1ca040..4a386d3f8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
@@ -4,7 +4,7 @@ import android.net.Uri
 import coil.map.Mapper
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 class FaviconMapper() : Mapper<Uri, HttpUrl> {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt
new file mode 100644
index 000000000..2e5c222e8
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt
@@ -0,0 +1,53 @@
+package org.koitharu.kotatsu.core.parser
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.Base64
+import android.webkit.WebView
+import androidx.core.os.LocaleListCompat
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import org.koitharu.kotatsu.core.network.AndroidCookieJar
+import org.koitharu.kotatsu.core.prefs.SourceSettings
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaSourceConfig
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.utils.ext.toList
+import java.util.*
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+class MangaLoaderContextImpl(
+	override val httpClient: OkHttpClient,
+	override val cookieJar: AndroidCookieJar,
+	private val androidContext: Context,
+) : MangaLoaderContext() {
+
+	@SuppressLint("SetJavaScriptEnabled")
+	override suspend fun evaluateJs(script: String): String? = withContext(Dispatchers.Main) {
+		val webView = WebView(androidContext)
+		webView.settings.javaScriptEnabled = true
+		suspendCoroutine { cont ->
+			webView.evaluateJavascript(script) { result ->
+				cont.resume(result?.takeUnless { it == "null" })
+			}
+		}
+	}
+
+	override fun getConfig(source: MangaSource): MangaSourceConfig {
+		return SourceSettings(androidContext, source)
+	}
+
+	override fun encodeBase64(data: ByteArray): String {
+		return Base64.encodeToString(data, Base64.NO_PADDING)
+	}
+
+	override fun decodeBase64(data: String): ByteArray {
+		return Base64.decode(data, Base64.DEFAULT)
+	}
+
+	override fun getPreferredLocales(): List<Locale> {
+		return LocaleListCompat.getAdjustedDefault().toList()
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
index 45103954f..1857064b3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.core.parser
 
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
-import org.koin.core.qualifier.named
-import org.koitharu.kotatsu.core.model.*
+import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.model.*
 
 interface MangaRepository {
 
@@ -11,7 +11,7 @@ interface MangaRepository {
 
 	val sortOrders: Set<SortOrder>
 
-	suspend fun getList2(
+	suspend fun getList(
 		offset: Int,
 		query: String? = null,
 		tags: Set<MangaTag>? = null,
@@ -29,7 +29,11 @@ interface MangaRepository {
 	companion object : KoinComponent {
 
 		operator fun invoke(source: MangaSource): MangaRepository {
-			return get(named(source))
+			return if (source == MangaSource.LOCAL) {
+				get<LocalMangaRepository>()
+			} else {
+				RemoteMangaRepository(source, get())
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepositoryAuthProvider.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepositoryAuthProvider.kt
deleted file mode 100644
index 86fbf4926..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepositoryAuthProvider.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-interface MangaRepositoryAuthProvider {
-
-	val authUrl: String
-
-	fun isAuthorized(): Boolean
-
-	suspend fun getUsername(): String
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/ParserModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/ParserModule.kt
deleted file mode 100644
index ef16f37a9..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/ParserModule.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import org.koin.core.qualifier.named
-import org.koin.dsl.module
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.parser.site.*
-
-val parserModule
-	get() = module {
-
-		factory<MangaRepository>(named(MangaSource.READMANGA_RU)) { ReadmangaRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MINTMANGA)) { MintMangaRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.SELFMANGA)) { SelfMangaRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MANGACHAN)) { MangaChanRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.DESUME)) { DesuMeRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.HENCHAN)) { HenChanRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.YAOICHAN)) { YaoiChanRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MANGATOWN)) { MangaTownRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MANGALIB)) { MangaLibRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.NUDEMOON)) { NudeMoonRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MANGAREAD)) { MangareadRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.REMANGA)) { RemangaRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.HENTAILIB)) { HentaiLibRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.ANIBEL)) { AnibelRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_EN)) { NineMangaRepository.English(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_BR)) { NineMangaRepository.Brazil(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_DE)) { NineMangaRepository.Deutsch(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_ES)) { NineMangaRepository.Spanish(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_RU)) { NineMangaRepository.Russian(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_IT)) { NineMangaRepository.Italiano(get()) }
-		factory<MangaRepository>(named(MangaSource.NINEMANGA_FR)) { NineMangaRepository.Francais(get()) }
-		factory<MangaRepository>(named(MangaSource.EXHENTAI)) { ExHentaiRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MANGAOWL)) { MangaOwlRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.MANGADEX)) { MangaDexRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.BATOTO)) { BatoToRepository(get()) }
-		factory<MangaRepository>(named(MangaSource.COMICK_FUN)) { ComickFunRepository(get()) }
-	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
index f66e4b14f..4d61eea77 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
@@ -1,84 +1,42 @@
 package org.koitharu.kotatsu.core.parser
 
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.MangaPage
-import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.core.prefs.SourceSettings
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
+import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.newParser
 
-abstract class RemoteMangaRepository(
-	protected val loaderContext: MangaLoaderContext
+class RemoteMangaRepository(
+	override val source: MangaSource,
+	loaderContext: MangaLoaderContext,
 ) : MangaRepository {
 
-	protected abstract val defaultDomain: String
+	private val parser: MangaParser = source.newParser(loaderContext)
 
-	private val conf by lazy {
-		loaderContext.getSettings(source)
-	}
+	override val sortOrders: Set<SortOrder>
+		get() = parser.sortOrders
 
-	val title: String
-		get() = source.title
+	override suspend fun getList(
+		offset: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
+	): List<Manga> = parser.getList(offset, query, tags, sortOrder)
 
-	override suspend fun getPageUrl(page: MangaPage): String = page.url.withDomain()
+	override suspend fun getDetails(manga: Manga): Manga = parser.getDetails(manga)
 
-	override suspend fun getTags(): Set<MangaTag> = emptySet()
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = parser.getPages(chapter)
 
-	open fun getFaviconUrl() = "https://${getDomain()}/favicon.ico"
+	override suspend fun getPageUrl(page: MangaPage): String = parser.getPageUrl(page)
 
-	open fun onCreatePreferences(map: MutableMap<String, Any>) {
-		map[SourceSettings.KEY_DOMAIN] = defaultDomain
-	}
+	override suspend fun getTags(): Set<MangaTag> = parser.getTags()
 
-	protected fun getDomain() = conf.getDomain(defaultDomain)
+	fun getFaviconUrl(): String = parser.getFaviconUrl()
 
-	protected fun String.withDomain(subdomain: String? = null) = when {
-		this.startsWith("//") -> buildString {
-			append("http")
-			if (conf.isUseSsl(true)) {
-				append('s')
-			}
-			append(":")
-			append(this@withDomain)
-		}
-		this.startsWith("/") -> buildString {
-			append("http")
-			if (conf.isUseSsl(true)) {
-				append('s')
-			}
-			append("://")
-			if (subdomain != null) {
-				append(subdomain)
-				append('.')
-				append(conf.getDomain(defaultDomain).removePrefix("www."))
-			} else {
-				append(conf.getDomain(defaultDomain))
-			}
-			append(this@withDomain)
-		}
-		else -> this
-	}
+	fun getAuthProvider(): MangaParserAuthProvider? = parser as? MangaParserAuthProvider
 
-	protected fun generateUid(url: String): Long {
-		var h = 1125899906842597L
-		source.name.forEach { c ->
-			h = 31 * h + c.code
-		}
-		url.forEach { c ->
-			h = 31 * h + c.code
-		}
-		return h
-	}
-
-	protected fun generateUid(id: Long): Long {
-		var h = 1125899906842597L
-		source.name.forEach { c ->
-			h = 31 * h + c.code
-		}
-		h = 31 * h + id
-		return h
-	}
-
-	protected fun parseFailed(message: String? = null): Nothing {
-		throw ParseException(message)
+	fun onCreatePreferences(map: MutableMap<String, Any>) {
+		map[SourceSettings.KEY_DOMAIN] = parser.defaultDomain
 	}
 }
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/AnibelRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/AnibelRepository.kt
deleted file mode 100644
index beb969daf..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/AnibelRepository.kt
+++ /dev/null
@@ -1,262 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import androidx.collection.ArraySet
-import org.json.JSONArray
-import org.json.JSONObject
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.map
-import org.koitharu.kotatsu.utils.ext.mapIndexed
-import org.koitharu.kotatsu.utils.ext.stringIterator
-import java.util.*
-
-class AnibelRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.ANIBEL
-
-	override val defaultDomain = "anibel.net"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.NEWEST
-	)
-
-	override fun getFaviconUrl(): String {
-		return "https://cdn.${getDomain()}/favicons/favicon.png"
-	}
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?,
-	): List<Manga> {
-		if (!query.isNullOrEmpty()) {
-			return if (offset == 0) {
-				search(query)
-			} else {
-				emptyList()
-			}
-		}
-		val filters = tags?.takeUnless { it.isEmpty() }?.joinToString(
-			separator = ",",
-			prefix = "genres: [",
-			postfix = "]"
-		) { "\"it.key\"" }.orEmpty()
-		val array = apiCall(
-			"""
-			getMediaList(offset: $offset, limit: 20, mediaType: manga, filters: {$filters}) {
-				docs {
-					mediaId
-					title {
-						be
-						alt
-					}
-					rating
-					poster
-					genres
-					slug
-					mediaType
-          			status
-				}
-			}
-			""".trimIndent()
-		).getJSONObject("getMediaList").getJSONArray("docs")
-		return array.map { jo ->
-			val mediaId = jo.getString("mediaId")
-			val title = jo.getJSONObject("title")
-			val href = "${jo.getString("mediaType")}/${jo.getString("slug")}"
-			Manga(
-				id = generateUid(mediaId),
-				title = title.getString("be"),
-				coverUrl = jo.getString("poster").removePrefix("/cdn")
-					.withDomain("cdn") + "?width=200&height=280",
-				altTitle = title.getString("alt").takeUnless(String::isEmpty),
-				author = null,
-				rating = jo.getDouble("rating").toFloat() / 10f,
-				url = href,
-				publicUrl = "https://${getDomain()}/${href}",
-				tags = jo.getJSONArray("genres").mapToTags(),
-				state = when (jo.getString("status")) {
-					"ongoing" -> MangaState.ONGOING
-					"finished" -> MangaState.FINISHED
-					else -> null
-				},
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val (type, slug) = manga.url.split('/')
-		val details = apiCall(
-			"""
-			media(mediaType: $type, slug: "$slug") {
-				mediaId
-				title {
-					be
-					alt
-				}
-				description {
-					be
-				}
-				status
-				poster
-				rating
-				genres
-			}
-			""".trimIndent()
-		).getJSONObject("media")
-		val title = details.getJSONObject("title")
-		val poster = details.getString("poster").removePrefix("/cdn")
-			.withDomain("cdn")
-		val chapters = apiCall(
-			"""
-			chapters(mediaId: "${details.getString("mediaId")}") {
-				id
-				chapter
-				released
-			}
-			""".trimIndent()
-		).getJSONArray("chapters")
-		return manga.copy(
-			title = title.getString("be"),
-			altTitle = title.getString("alt"),
-			coverUrl = "$poster?width=200&height=280",
-			largeCoverUrl = poster,
-			description = details.getJSONObject("description").getString("be"),
-			rating = details.getDouble("rating").toFloat() / 10f,
-			tags = details.getJSONArray("genres").mapToTags(),
-			state = when (details.getString("status")) {
-				"ongoing" -> MangaState.ONGOING
-				"finished" -> MangaState.FINISHED
-				else -> null
-			},
-			chapters = chapters.map { jo ->
-				val number = jo.getInt("chapter")
-				MangaChapter(
-					id = generateUid(jo.getString("id")),
-					name = "Глава $number",
-					number = number,
-					url = "${manga.url}/read/$number",
-					scanlator = null,
-					uploadDate = jo.getLong("released"),
-					branch = null,
-					source = source,
-				)
-			}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val (_, slug, _, number) = chapter.url.split('/')
-		val chapterJson = apiCall(
-			"""
-			chapter(slug: "$slug", chapter: $number) {
-				id
-				images {
-					large
-					thumbnail
-				}
-			}
-			""".trimIndent()
-		).getJSONObject("chapter")
-		val pages = chapterJson.getJSONArray("images")
-		val chapterUrl = "https://${getDomain()}/${chapter.url}"
-		return pages.mapIndexed { i, jo ->
-			MangaPage(
-				id = generateUid("${chapter.url}/$i"),
-				url = jo.getString("large"),
-				referer = chapterUrl,
-				preview = jo.getString("thumbnail"),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val json = apiCall(
-			"""
-			getFilters(mediaType: manga) {
-				genres
-			}
-			""".trimIndent()
-		)
-		val array = json.getJSONObject("getFilters").getJSONArray("genres")
-		return array.mapToTags()
-	}
-
-	private suspend fun search(query: String): List<Manga> {
-		val json = apiCall(
-			"""
-			search(query: "$query", limit: 40) {
-				id
-				title {
-					be
-					en
-				}
-				poster
-				url
-				type
-			}
-			""".trimIndent()
-		)
-		val array = json.getJSONArray("search")
-		return array.map { jo ->
-			val mediaId = jo.getString("id")
-			val title = jo.getJSONObject("title")
-			val href = "${jo.getString("type").lowercase()}/${jo.getString("url")}"
-			Manga(
-				id = generateUid(mediaId),
-				title = title.getString("be"),
-				coverUrl = jo.getString("poster").removePrefix("/cdn")
-					.withDomain("cdn") + "?width=200&height=280",
-				altTitle = title.getString("en").takeUnless(String::isEmpty),
-				author = null,
-				rating = Manga.NO_RATING,
-				url = href,
-				publicUrl = "https://${getDomain()}/${href}",
-				tags = emptySet(),
-				state = null,
-				source = source,
-			)
-		}
-	}
-
-	private suspend fun apiCall(request: String): JSONObject {
-		return loaderContext.graphQLQuery("https://api.${getDomain()}/graphql", request)
-			.getJSONObject("data")
-	}
-
-	private fun JSONArray.mapToTags(): Set<MangaTag> {
-
-		fun toTitle(slug: String): String {
-			val builder = StringBuilder(slug)
-			var capitalize = true
-			for ((i, c) in builder.withIndex()) {
-				when {
-					c == '-' -> {
-						builder.setCharAt(i, ' ')
-					}
-					capitalize -> {
-						builder.setCharAt(i, c.uppercaseChar())
-						capitalize = false
-					}
-				}
-			}
-			return builder.toString()
-		}
-
-		val result = ArraySet<MangaTag>(length())
-		stringIterator().forEach {
-			result.add(
-				MangaTag(
-					title = toTitle(it),
-					key = it,
-					source = source,
-				)
-			)
-		}
-		return result
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/BatoToRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/BatoToRepository.kt
deleted file mode 100644
index 45a3abbc4..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/BatoToRepository.kt
+++ /dev/null
@@ -1,307 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import android.util.Base64
-import androidx.collection.ArraySet
-import org.json.JSONArray
-import org.json.JSONObject
-import org.jsoup.nodes.Element
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.nio.charset.StandardCharsets
-import java.security.MessageDigest
-import java.util.*
-import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-private const val PAGE_SIZE = 60
-private const val PAGE_SIZE_SEARCH = 20
-
-class BatoToRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.BATOTO
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.NEWEST,
-		SortOrder.UPDATED,
-		SortOrder.POPULARITY,
-		SortOrder.ALPHABETICAL
-	)
-
-	override val defaultDomain: String = "bato.to"
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		if (!query.isNullOrEmpty()) {
-			return search(offset, query)
-		}
-		val page = (offset / PAGE_SIZE) + 1
-
-		@Suppress("NON_EXHAUSTIVE_WHEN_STATEMENT")
-		val url = buildString {
-			append("https://")
-			append(getDomain())
-			append("/browse?sort=")
-			when (sortOrder) {
-				null,
-				SortOrder.UPDATED -> append("update.za")
-				SortOrder.POPULARITY -> append("views_a.za")
-				SortOrder.NEWEST -> append("create.za")
-				SortOrder.ALPHABETICAL -> append("title.az")
-			}
-			if (!tags.isNullOrEmpty()) {
-				append("&genres=")
-				appendAll(tags, ",") { it.key }
-			}
-			append("&page=")
-			append(page)
-		}
-		return parseList(url, page)
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val root = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
-			.getElementById("mainer") ?: parseFailed("Cannot find root")
-		val details = root.selectFirst(".detail-set") ?: parseFailed("Cannot find detail-set")
-		val attrs = details.selectFirst(".attr-main")?.select(".attr-item")?.associate {
-			it.child(0).text().trim() to it.child(1)
-		}.orEmpty()
-		return manga.copy(
-			title = root.selectFirst("h3.item-title")?.text() ?: manga.title,
-			isNsfw = !root.selectFirst("alert")?.getElementsContainingOwnText("NSFW").isNullOrEmpty(),
-			largeCoverUrl = details.selectFirst("img[src]")?.absUrl("src"),
-			description = details.getElementById("limit-height-body-summary")
-				?.selectFirst(".limit-html")
-				?.html(),
-			tags = manga.tags + attrs["Genres:"]?.parseTags().orEmpty(),
-			state = when (attrs["Release status:"]?.text()) {
-				"Ongoing" -> MangaState.ONGOING
-				"Completed" -> MangaState.FINISHED
-				else -> manga.state
-			},
-			author = attrs["Authors:"]?.text()?.trim() ?: manga.author,
-			chapters = root.selectFirst(".episode-list")
-				?.selectFirst(".main")
-				?.children()
-				?.reversed()
-				?.mapIndexedNotNull { i, div ->
-					div.parseChapter(i)
-				}.orEmpty()
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val scripts = loaderContext.httpGet(fullUrl).parseHtml().select("script")
-		for (script in scripts) {
-			val scriptSrc = script.html()
-			val p = scriptSrc.indexOf("const images =")
-			if (p == -1) continue
-			val start = scriptSrc.indexOf('[', p)
-			val end = scriptSrc.indexOf(';', start)
-			if (start == -1 || end == -1) {
-				continue
-			}
-			val images = JSONArray(scriptSrc.substring(start, end))
-			val batoJs = scriptSrc.substringBetweenFirst("batojs =", ";")?.trim(' ', '"', '\n')
-				?: parseFailed("Cannot find batojs")
-			val server = scriptSrc.substringBetweenFirst("server =", ";")?.trim(' ', '"', '\n')
-				?: parseFailed("Cannot find server")
-			val password = loaderContext.evaluateJs(batoJs)?.removeSurrounding('"')
-				?: parseFailed("Cannot evaluate batojs")
-			val serverDecrypted = decryptAES(server, password).removeSurrounding('"')
-			val result = ArrayList<MangaPage>(images.length())
-			repeat(images.length()) { i ->
-				val url = images.getString(i)
-				result += MangaPage(
-					id = generateUid(url),
-					url = if (url.startsWith("http")) url else "$serverDecrypted$url",
-					referer = fullUrl,
-					preview = null,
-					source = source,
-				)
-			}
-			return result
-		}
-		parseFailed("Cannot find images list")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val scripts = loaderContext.httpGet(
-			"https://${getDomain()}/browse"
-		).parseHtml().select("script")
-		for (script in scripts) {
-			val genres = script.html().substringBetweenFirst("const _genres =", ";") ?: continue
-			val jo = JSONObject(genres)
-			val result = ArraySet<MangaTag>(jo.length())
-			jo.keys().forEach { key ->
-				val item = jo.getJSONObject(key)
-				result += MangaTag(
-					title = item.getString("text").toTitleCase(),
-					key = item.getString("file"),
-					source = source,
-				)
-			}
-			return result
-		}
-		parseFailed("Cannot find gernes list")
-	}
-
-	override fun getFaviconUrl(): String = "https://styles.amarkcdn.com/img/batoto/favicon.ico?v0"
-
-	private suspend fun search(offset: Int, query: String): List<Manga> {
-		val page = (offset / PAGE_SIZE_SEARCH) + 1
-		val url = buildString {
-			append("https://")
-			append(getDomain())
-			append("/search?word=")
-			append(query.replace(' ', '+'))
-			append("&page=")
-			append(page)
-		}
-		return parseList(url, page)
-	}
-
-	private fun getActivePage(body: Element): Int = body.select("nav ul.pagination > li.page-item.active")
-		.lastOrNull()
-		?.text()
-		?.toIntOrNull() ?: parseFailed("Cannot determine current page")
-
-	private suspend fun parseList(url: String, page: Int): List<Manga> {
-		val body = loaderContext.httpGet(url).parseHtml().body()
-		if (body.selectFirst(".browse-no-matches") != null) {
-			return emptyList()
-		}
-		val activePage = getActivePage(body)
-		if (activePage != page) {
-			return emptyList()
-		}
-		val root = body.getElementById("series-list") ?: parseFailed("Cannot find root")
-		return root.children().map { div ->
-			val a = div.selectFirst("a") ?: parseFailed()
-			val href = a.relUrl("href")
-			val title = div.selectFirst(".item-title")?.text() ?: parseFailed("Title not found")
-			Manga(
-				id = generateUid(href),
-				title = title,
-				altTitle = div.selectFirst(".item-alias")?.text()?.takeUnless { it == title },
-				url = href,
-				publicUrl = a.absUrl("href"),
-				rating = Manga.NO_RATING,
-				isNsfw = false,
-				coverUrl = div.selectFirst("img[src]")?.absUrl("src").orEmpty(),
-				largeCoverUrl = null,
-				description = null,
-				tags = div.selectFirst(".item-genre")?.parseTags().orEmpty(),
-				state = null,
-				author = null,
-				source = source,
-			)
-		}
-	}
-
-	private fun Element.parseTags() = children().mapToSet { span ->
-		val text = span.ownText()
-		MangaTag(
-			title = text.toTitleCase(),
-			key = text.lowercase(Locale.ENGLISH).replace(' ', '_'),
-			source = source,
-		)
-	}
-
-	private fun Element.parseChapter(index: Int): MangaChapter? {
-		val a = selectFirst("a.chapt") ?: return null
-		val extra = selectFirst(".extra")
-		val href = a.relUrl("href")
-		return MangaChapter(
-			id = generateUid(href),
-			name = a.text(),
-			number = index + 1,
-			url = href,
-			scanlator = extra?.getElementsByAttributeValueContaining("href", "/group/")?.text(),
-			uploadDate = runCatching {
-				parseChapterDate(extra?.select("i")?.lastOrNull()?.ownText())
-			}.getOrDefault(0),
-			branch = null,
-			source = source,
-		)
-	}
-
-	private fun parseChapterDate(date: String?): Long {
-		if (date.isNullOrEmpty()) {
-			return 0
-		}
-		val value = date.substringBefore(' ').toInt()
-		val field = when {
-			"sec" in date -> Calendar.SECOND
-			"min" in date -> Calendar.MINUTE
-			"hour" in date -> Calendar.HOUR
-			"day" in date -> Calendar.DAY_OF_MONTH
-			"week" in date -> Calendar.WEEK_OF_YEAR
-			"month" in date -> Calendar.MONTH
-			"year" in date -> Calendar.YEAR
-			else -> return 0
-		}
-		val calendar = Calendar.getInstance()
-		calendar.add(field, -value)
-		return calendar.timeInMillis
-	}
-
-	private fun decryptAES(encrypted: String, password: String): String {
-		val cipherData = Base64.decode(encrypted, Base64.DEFAULT)
-		val saltData = cipherData.copyOfRange(8, 16)
-		val (key, iv) = generateKeyAndIV(
-			keyLength = 32,
-			ivLength = 16,
-			iterations = 1,
-			salt = saltData,
-			password = password.toByteArray(StandardCharsets.UTF_8),
-			md = MessageDigest.getInstance("MD5"),
-		)
-		val encryptedData = cipherData.copyOfRange(16, cipherData.size)
-		val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
-		cipher.init(Cipher.DECRYPT_MODE, key, iv)
-		return cipher.doFinal(encryptedData).toString(Charsets.UTF_8)
-	}
-
-	@Suppress("SameParameterValue")
-	private fun generateKeyAndIV(
-		keyLength: Int,
-		ivLength: Int,
-		iterations: Int,
-		salt: ByteArray,
-		password: ByteArray,
-		md: MessageDigest,
-	): Pair<SecretKeySpec, IvParameterSpec> {
-		val digestLength = md.digestLength
-		val requiredLength = (keyLength + ivLength + digestLength - 1) / digestLength * digestLength
-		val generatedData = ByteArray(requiredLength)
-		var generatedLength = 0
-		md.reset()
-		while (generatedLength < keyLength + ivLength) {
-			if (generatedLength > 0) {
-				md.update(generatedData, generatedLength - digestLength, digestLength)
-			}
-			md.update(password)
-			md.update(salt, 0, 8)
-			md.digest(generatedData, generatedLength, digestLength)
-			repeat(iterations - 1) {
-				md.update(generatedData, generatedLength, digestLength)
-				md.digest(generatedData, generatedLength, digestLength)
-			}
-			generatedLength += digestLength
-		}
-
-		return SecretKeySpec(generatedData.copyOfRange(0, keyLength), "AES") to IvParameterSpec(
-			if (ivLength > 0) {
-				generatedData.copyOfRange(keyLength, keyLength + ivLength)
-			} else byteArrayOf()
-		)
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt
deleted file mode 100644
index 6e7005757..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(
-	loaderContext
-) {
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.NEWEST,
-		SortOrder.POPULARITY,
-		SortOrder.ALPHABETICAL
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		val domain = getDomain()
-		val url = when {
-			!query.isNullOrEmpty() -> {
-				if (offset != 0) {
-					return emptyList()
-				}
-				"https://$domain/?do=search&subaction=search&story=${query.urlEncoded()}"
-			}
-			!tags.isNullOrEmpty() -> tags.joinToString(
-				prefix = "https://$domain/tags/",
-				postfix = "&n=${getSortKey2(sortOrder)}?offset=$offset",
-				separator = "+",
-			) { tag -> tag.key }
-			else -> "https://$domain/${getSortKey(sortOrder)}?offset=$offset"
-		}
-		val doc = loaderContext.httpGet(url).parseHtml()
-		val root = doc.body().selectFirst("div.main_fon")?.getElementById("content")
-			?: throw ParseException("Cannot find root")
-		return root.select("div.content_row").mapNotNull { row ->
-			val a = row.selectFirst("div.manga_row1")?.selectFirst("h2")?.selectFirst("a")
-				?: return@mapNotNull null
-			val href = a.relUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.inContextOf(a),
-				altTitle = a.attr("title"),
-				title = a.text().substringAfterLast('(').substringBeforeLast(')'),
-				author = row.getElementsByAttributeValueStarting(
-					"href",
-					"/mangaka"
-				).firstOrNull()?.text(),
-				coverUrl = row.selectFirst("div.manga_images")?.selectFirst("img")
-					?.absUrl("src").orEmpty(),
-				tags = runCatching {
-					row.selectFirst("div.genre")?.select("a")?.mapToSet {
-						MangaTag(
-							title = it.text().toTagName(),
-							key = it.attr("href").substringAfterLast('/').urlEncoded(),
-							source = source
-						)
-					}
-				}.getOrNull().orEmpty(),
-				source = source
-			)
-		}
-	}
-
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
-		val root =
-			doc.body().getElementById("dle-content") ?: throw ParseException("Cannot find root")
-		val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)
-		return manga.copy(
-			description = root.getElementById("description")?.html()?.substringBeforeLast("<div"),
-			largeCoverUrl = root.getElementById("cover")?.absUrl("src"),
-			chapters = root.select("table.table_cha tr:gt(1)").reversed().mapIndexedNotNull { i, tr ->
-				val href = tr?.selectFirst("a")?.relUrl("href") ?: return@mapIndexedNotNull null
-				MangaChapter(
-					id = generateUid(href),
-					name = tr.selectFirst("a")?.text().orEmpty(),
-					number = i + 1,
-					url = href,
-					scanlator = null,
-					branch = null,
-					uploadDate = dateFormat.tryParse(tr.selectFirst("div.date")?.text()),
-					source = source,
-				)
-			}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		val scripts = doc.select("script")
-		for (script in scripts) {
-			val data = script.html()
-			val pos = data.indexOf("\"fullimg")
-			if (pos == -1) {
-				continue
-			}
-			val json = data.substring(pos).substringAfter('[').substringBefore(';')
-				.substringBeforeLast(']')
-			val domain = getDomain()
-			return json.split(",").mapNotNull {
-				it.trim()
-					.removeSurrounding('"', '\'')
-					.toRelativeUrl(domain)
-					.takeUnless(String::isBlank)
-			}.map { url ->
-				MangaPage(
-					id = generateUid(url),
-					url = url,
-					preview = null,
-					referer = fullUrl,
-					source = source,
-				)
-			}
-		}
-		throw ParseException("Pages list not found at ${chapter.url}")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val domain = getDomain()
-		val doc = loaderContext.httpGet("https://$domain/catalog").parseHtml()
-		val root = doc.body().selectFirst("div.main_fon")?.getElementById("side")
-			?.select("ul")?.last() ?: throw ParseException("Cannot find root")
-		return root.select("li.sidetag").mapToSet { li ->
-			val a = li.children().last() ?: throw ParseException("a is null")
-			MangaTag(
-				title = a.text().toTagName(),
-				key = a.attr("href").substringAfterLast('/'),
-				source = source
-			)
-		}
-	}
-
-	private fun getSortKey(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
-			SortOrder.ALPHABETICAL -> "catalog"
-			SortOrder.POPULARITY -> "mostfavorites"
-			SortOrder.NEWEST -> "manga/new"
-			else -> "mostfavorites"
-		}
-
-	private fun getSortKey2(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
-			SortOrder.ALPHABETICAL -> "abcasc"
-			SortOrder.POPULARITY -> "favdesc"
-			SortOrder.NEWEST -> "datedesc"
-			else -> "favdesc"
-		}
-
-	private fun String.toTagName() = replace('_', ' ').toTitleCase()
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt
deleted file mode 100644
index bd0b858f1..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import android.util.SparseArray
-import androidx.collection.ArraySet
-import org.json.JSONArray
-import org.json.JSONObject
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-/**
- * https://api.comick.fun/docs/static/index.html
- */
-
-private const val PAGE_SIZE = 20
-private const val CHAPTERS_LIMIT = 99999
-
-class ComickFunRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
-	override val defaultDomain = "comick.fun"
-	override val source = MangaSource.COMICK_FUN
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.POPULARITY,
-		SortOrder.UPDATED,
-		SortOrder.RATING,
-	)
-
-	@Volatile
-	private var cachedTags: SparseArray<MangaTag>? = null
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		val domain = getDomain()
-		val url = buildString {
-			append("https://api.")
-			append(domain)
-			append("/search?tachiyomi=true")
-			if (!query.isNullOrEmpty()) {
-				if (offset > 0) {
-					return emptyList()
-				}
-				append("&q=")
-				append(query.urlEncoded())
-			} else {
-				append("&limit=")
-				append(PAGE_SIZE)
-				append("&page=")
-				append((offset / PAGE_SIZE) + 1)
-				if (!tags.isNullOrEmpty()) {
-					append("&genres=")
-					appendAll(tags, "&genres=", MangaTag::key)
-				}
-				append("&sort=") // view, uploaded, rating, follow, user_follow_count
-				append(
-					when (sortOrder) {
-						SortOrder.POPULARITY -> "view"
-						SortOrder.RATING -> "rating"
-						else -> "uploaded"
-					}
-				)
-			}
-		}
-		val ja = loaderContext.httpGet(url).parseJsonArray()
-		val tagsMap = cachedTags ?: loadTags()
-		return ja.map { jo ->
-			val slug = jo.getString("slug")
-			Manga(
-				id = generateUid(slug),
-				title = jo.getString("title"),
-				altTitle = null,
-				url = slug,
-				publicUrl = "https://$domain/comic/$slug",
-				rating = jo.getDouble("rating").toFloat() / 10f,
-				isNsfw = false,
-				coverUrl = jo.getString("cover_url"),
-				largeCoverUrl = null,
-				description = jo.getStringOrNull("desc"),
-				tags = jo.selectGenres("genres", tagsMap),
-				state = runCatching {
-					if (jo.getBoolean("translation_completed")) {
-						MangaState.FINISHED
-					} else {
-						MangaState.ONGOING
-					}
-				}.getOrNull(),
-				author = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val domain = getDomain()
-		val url = "https://api.$domain/comic/${manga.url}?tachiyomi=true"
-		val jo = loaderContext.httpGet(url).parseJson()
-		val comic = jo.getJSONObject("comic")
-		return manga.copy(
-			title = comic.getString("title"),
-			altTitle = null, // TODO
-			isNsfw = jo.getBoolean("matureContent") || comic.getBoolean("hentai"),
-			description = comic.getStringOrNull("parsed") ?: comic.getString("desc"),
-			tags = manga.tags + jo.getJSONArray("genres").mapToSet {
-				MangaTag(
-					title = it.getString("name"),
-					key = it.getString("slug"),
-					source = source,
-				)
-			},
-			author = jo.getJSONArray("artists").optJSONObject(0)?.getString("name"),
-			chapters = getChapters(comic.getLong("id")),
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val jo = loaderContext.httpGet(
-			"https://api.${getDomain()}/chapter/${chapter.url}?tachiyomi=true"
-		).parseJson().getJSONObject("chapter")
-		val referer = "https://${getDomain()}/"
-		return jo.getJSONArray("images").map {
-			val url = it.getString("url")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				referer = referer,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val sparseArray = cachedTags ?: loadTags()
-		val set = ArraySet<MangaTag>(sparseArray.size())
-		for (i in 0 until sparseArray.size()) {
-			set.add(sparseArray.valueAt(i))
-		}
-		return set
-	}
-
-	private suspend fun loadTags(): SparseArray<MangaTag> {
-		val ja = loaderContext.httpGet("https://api.${getDomain()}/genre").parseJsonArray()
-		val tags = SparseArray<MangaTag>(ja.length())
-		for (jo in ja) {
-			tags.append(
-				jo.getInt("id"),
-				MangaTag(
-					title = jo.getString("name"),
-					key = jo.getString("slug"),
-					source = source,
-				)
-			)
-		}
-		cachedTags = tags
-		return tags
-	}
-
-	private suspend fun getChapters(id: Long): List<MangaChapter> {
-		val ja = loaderContext.httpGet(
-			url = "https://api.${getDomain()}/comic/$id/chapter?tachiyomi=true&limit=$CHAPTERS_LIMIT"
-		).parseJson().getJSONArray("chapters")
-		val dateFormat = SimpleDateFormat("yyyy-MM-dd")
-		val counters = HashMap<Locale, Int>()
-		return ja.mapReversed { jo ->
-			val locale = Locale.forLanguageTag(jo.getString("lang"))
-			var number = counters[locale] ?: 0
-			number++
-			counters[locale] = number
-			MangaChapter(
-				id = generateUid(jo.getLong("id")),
-				name = buildString {
-					jo.getStringOrNull("vol")?.let { append("Vol ").append(it).append(' ') }
-					jo.getStringOrNull("chap")?.let { append("Chap ").append(it) }
-					jo.getStringOrNull("title")?.let { append(": ").append(it) }
-				},
-				number = number,
-				url = jo.getString("hid"),
-				scanlator = jo.optJSONArray("group_name")?.optString(0),
-				uploadDate = dateFormat.tryParse(jo.getString("created_at").substringBefore('T')),
-				branch = locale.getDisplayName(locale).toTitleCase(locale),
-				source = source,
-			)
-		}
-	}
-
-	private inline fun <R> JSONArray.mapReversed(block: (JSONObject) -> R): List<R> {
-		val len = length()
-		val destination = ArrayList<R>(len)
-		for (i in (0 until len).reversed()) {
-			val jo = getJSONObject(i)
-			destination.add(block(jo))
-		}
-		return destination
-	}
-
-	private fun JSONObject.selectGenres(name: String, tags: SparseArray<MangaTag>): Set<MangaTag> {
-		val array = optJSONArray(name) ?: return emptySet()
-		val res = ArraySet<MangaTag>(array.length())
-		for (i in 0 until array.length()) {
-			val id = array.getInt(i)
-			val tag = tags.get(id) ?: continue
-			res.add(tag)
-		}
-		return res
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/DesuMeRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/DesuMeRepository.kt
deleted file mode 100644
index 308f209b0..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/DesuMeRepository.kt
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.util.*
-
-class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.DESUME
-
-	override val defaultDomain = "desu.me"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.UPDATED,
-		SortOrder.POPULARITY,
-		SortOrder.NEWEST,
-		SortOrder.ALPHABETICAL
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		if (query != null && offset != 0) {
-			return emptyList()
-		}
-		val domain = getDomain()
-		val url = buildString {
-			append("https://")
-			append(domain)
-			append("/manga/api/?limit=20&order=")
-			append(getSortKey(sortOrder))
-			append("&page=")
-			append((offset / 20) + 1)
-			if (!tags.isNullOrEmpty()) {
-				append("&genres=")
-				appendAll(tags, ",") { it.key }
-			}
-			if (query != null) {
-				append("&search=")
-				append(query)
-			}
-		}
-		val json = loaderContext.httpGet(url).parseJson().getJSONArray("response")
-			?: throw ParseException("Invalid response")
-		val total = json.length()
-		val list = ArrayList<Manga>(total)
-		for (i in 0 until total) {
-			val jo = json.getJSONObject(i)
-			val cover = jo.getJSONObject("image")
-			val id = jo.getLong("id")
-			list += Manga(
-				url = "/manga/api/$id",
-				publicUrl = jo.getString("url"),
-				source = MangaSource.DESUME,
-				title = jo.getString("russian"),
-				altTitle = jo.getString("name"),
-				coverUrl = cover.getString("preview"),
-				largeCoverUrl = cover.getString("original"),
-				state = when {
-					jo.getInt("ongoing") == 1 -> MangaState.ONGOING
-					else -> null
-				},
-				rating = jo.getDouble("score").toFloat().coerceIn(0f, 1f),
-				id = generateUid(id),
-				description = jo.getString("description")
-			)
-		}
-		return list
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val url = manga.url.withDomain()
-		val json = loaderContext.httpGet(url).parseJson().getJSONObject("response")
-			?: throw ParseException("Invalid response")
-		val baseChapterUrl = manga.url + "/chapter/"
-		val chaptersList = json.getJSONObject("chapters").getJSONArray("list")
-		val totalChapters = chaptersList.length()
-		return manga.copy(
-			tags = json.getJSONArray("genres").mapToSet {
-				MangaTag(
-					key = it.getString("text"),
-					title = it.getString("russian").toTitleCase(),
-					source = manga.source
-				)
-			},
-			publicUrl = json.getString("url"),
-			description = json.getString("description"),
-			chapters = chaptersList.mapIndexed { i, it ->
-				val chid = it.getLong("id")
-				val volChap = "Том " + it.optString("vol", "0") + ". " + "Глава " + it.optString("ch", "0")
-				val title = it.optString("title", "null").takeUnless { it == "null" }
-				MangaChapter(
-					id = generateUid(chid),
-					source = manga.source,
-					url = "$baseChapterUrl$chid",
-					uploadDate = it.getLong("date") * 1000,
-					name = if (title.isNullOrEmpty()) volChap else "$volChap: $title",
-					number = totalChapters - i,
-					scanlator = null,
-					branch = null,
-				)
-			}.reversed()
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val json = loaderContext.httpGet(fullUrl)
-			.parseJson()
-			.getJSONObject("response") ?: throw ParseException("Invalid response")
-		return json.getJSONObject("pages").getJSONArray("list").map { jo ->
-			MangaPage(
-				id = generateUid(jo.getLong("id")),
-				referer = fullUrl,
-				preview = null,
-				source = chapter.source,
-				url = jo.getString("img"),
-			)
-		}
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}/manga/").parseHtml()
-		val root = doc.body().getElementById("animeFilter")
-			?.selectFirst(".catalog-genres") ?: throw ParseException("Root not found")
-		return root.select("li").mapToSet {
-			MangaTag(
-				source = source,
-				key = it.selectFirst("input")?.attr("data-genre") ?: parseFailed(),
-				title = it.selectFirst("label")?.text()?.toTitleCase() ?: parseFailed()
-			)
-		}
-	}
-
-	private fun getSortKey(sortOrder: SortOrder?) =
-		when (sortOrder) {
-			SortOrder.ALPHABETICAL -> "name"
-			SortOrder.POPULARITY -> "popular"
-			SortOrder.UPDATED -> "updated"
-			SortOrder.NEWEST -> "id"
-			else -> "updated"
-		}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ExHentaiRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ExHentaiRepository.kt
deleted file mode 100644
index d59e171ba..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ExHentaiRepository.kt
+++ /dev/null
@@ -1,281 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.jsoup.nodes.Element
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.util.*
-import kotlin.math.pow
-
-private const val DOMAIN_UNAUTHORIZED = "e-hentai.org"
-private const val DOMAIN_AUTHORIZED = "exhentai.org"
-
-class ExHentaiRepository(
-	loaderContext: MangaLoaderContext,
-) : RemoteMangaRepository(loaderContext), MangaRepositoryAuthProvider {
-
-	override val source = MangaSource.EXHENTAI
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.NEWEST,
-	)
-
-	override val defaultDomain: String
-		get() = if (isAuthorized()) DOMAIN_AUTHORIZED else DOMAIN_UNAUTHORIZED
-
-	override val authUrl: String
-		get() = "https://${getDomain()}/bounce_login.php"
-
-	private val ratingPattern = Regex("-?[0-9]+px")
-	private val authCookies = arrayOf("ipb_member_id", "ipb_pass_hash")
-	private var updateDm = false
-
-	init {
-		loaderContext.cookieJar.insertCookies(DOMAIN_AUTHORIZED, "nw=1", "sl=dm_2")
-		loaderContext.cookieJar.insertCookies(DOMAIN_UNAUTHORIZED, "nw=1", "sl=dm_2")
-	}
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?,
-	): List<Manga> {
-		val page = (offset / 25f).toIntUp()
-		var search = query?.urlEncoded().orEmpty()
-		val url = buildString {
-			append("https://")
-			append(getDomain())
-			append("/?page=")
-			append(page)
-			if (!tags.isNullOrEmpty()) {
-				var fCats = 0
-				for (tag in tags) {
-					tag.key.toIntOrNull()?.let { fCats = fCats or it } ?: run {
-						search += tag.key + " "
-					}
-				}
-				if (fCats != 0) {
-					append("&f_cats=")
-					append(1023 - fCats)
-				}
-			}
-			if (search.isNotEmpty()) {
-				append("&f_search=")
-				append(search.trim().replace(' ', '+'))
-			}
-			// by unknown reason cookie "sl=dm_2" is ignored, so, we should request it again
-			if (updateDm) {
-				append("&inline_set=dm_e")
-			}
-		}
-		val body = loaderContext.httpGet(url).parseHtml().body()
-		val root = body.selectFirst("table.itg")
-			?.selectFirst("tbody")
-			?: if (updateDm) {
-				parseFailed("Cannot find root")
-			} else {
-				updateDm = true
-				return getList2(offset, query, tags, sortOrder)
-			}
-		updateDm = false
-		return root.children().mapNotNull { tr ->
-			if (tr.childrenSize() != 2) return@mapNotNull null
-			val (td1, td2) = tr.children()
-			val glink = td2.selectFirst("div.glink") ?: parseFailed("glink not found")
-			val a = glink.parents().select("a").first() ?: parseFailed("link not found")
-			val href = a.relUrl("href")
-			val tagsDiv = glink.nextElementSibling() ?: parseFailed("tags div not found")
-			val mainTag = td2.selectFirst("div.cn")?.let { div ->
-				MangaTag(
-					title = div.text().toTitleCase(),
-					key = tagIdByClass(div.classNames()) ?: return@let null,
-					source = source,
-				)
-			}
-			Manga(
-				id = generateUid(href),
-				title = glink.text().cleanupTitle(),
-				altTitle = null,
-				url = href,
-				publicUrl = a.absUrl("href"),
-				rating = td2.selectFirst("div.ir")?.parseRating() ?: Manga.NO_RATING,
-				isNsfw = true,
-				coverUrl = td1.selectFirst("img")?.absUrl("src").orEmpty(),
-				tags = setOfNotNull(mainTag),
-				state = null,
-				author = tagsDiv.getElementsContainingOwnText("artist:").first()
-					?.nextElementSibling()?.text(),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
-		val root = doc.body().selectFirst("div.gm") ?: parseFailed("Cannot find root")
-		val cover = root.getElementById("gd1")?.children()?.first()
-		val title = root.getElementById("gd2")
-		val taglist = root.getElementById("taglist")
-		val tabs = doc.body().selectFirst("table.ptt")?.selectFirst("tr")
-		return manga.copy(
-			title = title?.getElementById("gn")?.text()?.cleanupTitle() ?: manga.title,
-			altTitle = title?.getElementById("gj")?.text()?.cleanupTitle() ?: manga.altTitle,
-			publicUrl = doc.baseUri().ifEmpty { manga.publicUrl },
-			rating = root.getElementById("rating_label")?.text()
-				?.substringAfterLast(' ')
-				?.toFloatOrNull()
-				?.div(5f) ?: manga.rating,
-			largeCoverUrl = cover?.css("background")?.cssUrl(),
-			description = taglist?.select("tr")?.joinToString("<br>") { tr ->
-				val (tc, td) = tr.children()
-				val subtags = td.select("a").joinToString { it.html() }
-				"<b>${tc.html()}</b> $subtags"
-			},
-			chapters = tabs?.select("a")?.findLast { a ->
-				a.text().toIntOrNull() != null
-			}?.let { a ->
-				val count = a.text().toInt()
-				val chapters = ArrayList<MangaChapter>(count)
-				for (i in 1..count) {
-					val url = "${manga.url}?p=$i"
-					chapters += MangaChapter(
-						id = generateUid(url),
-						name = "${manga.title} #$i",
-						number = i,
-						url = url,
-						uploadDate = 0L,
-						source = source,
-						scanlator = null,
-						branch = null,
-					)
-				}
-				chapters
-			},
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val doc = loaderContext.httpGet(chapter.url.withDomain()).parseHtml()
-		val root = doc.body().getElementById("gdt") ?: parseFailed("Root not found")
-		return root.select("a").mapNotNull { a ->
-			val url = a.relUrl("href")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				referer = a.absUrl("href"),
-				preview = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getPageUrl(page: MangaPage): String {
-		val doc = loaderContext.httpGet(page.url.withDomain()).parseHtml()
-		return doc.body().getElementById("img")?.absUrl("src")
-			?: parseFailed("Image not found")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}").parseHtml()
-		val root = doc.body().getElementById("searchbox")?.selectFirst("table")
-			?: parseFailed("Root not found")
-		return root.select("div.cs").mapNotNullToSet { div ->
-			val id = div.id().substringAfterLast('_').toIntOrNull()
-				?: return@mapNotNullToSet null
-			MangaTag(
-				title = div.text().toTitleCase(),
-				key = id.toString(),
-				source = source
-			)
-		}
-	}
-
-	override fun isAuthorized(): Boolean {
-		val authorized = isAuthorized(DOMAIN_UNAUTHORIZED)
-		if (authorized) {
-			if (!isAuthorized(DOMAIN_AUTHORIZED)) {
-				loaderContext.cookieJar.copyCookies(
-					DOMAIN_UNAUTHORIZED,
-					DOMAIN_AUTHORIZED,
-					authCookies,
-				)
-				loaderContext.cookieJar.insertCookies(DOMAIN_AUTHORIZED, "yay=louder")
-			}
-			return true
-		}
-		return false
-	}
-
-	override suspend fun getUsername(): String {
-		val doc = loaderContext.httpGet("https://forums.${DOMAIN_UNAUTHORIZED}/").parseHtml().body()
-		val username = doc.getElementById("userlinks")
-			?.getElementsByAttributeValueContaining("href", "?showuser=")
-			?.firstOrNull()
-			?.ownText()
-			?: if (doc.getElementById("userlinksguest") != null) {
-				throw AuthRequiredException(source)
-			} else {
-				throw ParseException()
-			}
-		return username
-	}
-
-	private fun isAuthorized(domain: String): Boolean {
-		val cookies = loaderContext.cookieJar.getCookies(domain).mapToSet { x -> x.name }
-		return authCookies.all { it in cookies }
-	}
-
-	private fun Element.parseRating(): Float {
-		return runCatching {
-			val style = requireNotNull(attr("style"))
-			val (v1, v2) = ratingPattern.find(style)!!.destructured
-			var p1 = v1.dropLast(2).toInt()
-			val p2 = v2.dropLast(2).toInt()
-			if (p2 != -1) {
-				p1 += 8
-			}
-			(80 - p1) / 80f
-		}.getOrDefault(Manga.NO_RATING)
-	}
-
-	private fun String.cleanupTitle(): String {
-		val result = StringBuilder(length)
-		var skip = false
-		for (c in this) {
-			when {
-				c == '[' -> skip = true
-				c == ']' -> skip = false
-				c.isWhitespace() && result.isEmpty() -> continue
-				!skip -> result.append(c)
-			}
-		}
-		while (result.lastOrNull()?.isWhitespace() == true) {
-			result.deleteCharAt(result.lastIndex)
-		}
-		return result.toString()
-	}
-
-	private fun String.cssUrl(): String? {
-		val fromIndex = indexOf("url(")
-		if (fromIndex == -1) {
-			return null
-		}
-		val toIndex = indexOf(')', startIndex = fromIndex)
-		return if (toIndex == -1) {
-			null
-		} else {
-			substring(fromIndex + 4, toIndex).trim()
-		}
-	}
-
-	private fun tagIdByClass(classNames: Collection<String>): String? {
-		val className = classNames.find { x -> x.startsWith("ct") } ?: return null
-		val num = className.drop(2).toIntOrNull(16) ?: return null
-		return 2.0.pow(num).toInt().toString()
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt
deleted file mode 100644
index b353aae80..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt
+++ /dev/null
@@ -1,248 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Response
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-private const val PAGE_SIZE = 70
-private const val PAGE_SIZE_SEARCH = 50
-private const val NSFW_ALERT = "сексуальные сцены"
-
-abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
-	RemoteMangaRepository(loaderContext) {
-
-	private val headers = Headers.Builder()
-		.add("User-Agent", "readmangafun")
-		.build()
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.UPDATED,
-		SortOrder.POPULARITY,
-		SortOrder.NEWEST,
-		SortOrder.RATING
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		val domain = getDomain()
-		val doc = when {
-			!query.isNullOrEmpty() -> loaderContext.httpPost(
-				"https://$domain/search",
-				mapOf(
-					"q" to query.urlEncoded(),
-					"offset" to (offset upBy PAGE_SIZE_SEARCH).toString()
-				)
-			)
-			tags.isNullOrEmpty() -> loaderContext.httpGet(
-				"https://$domain/list?sortType=${
-					getSortKey(
-						sortOrder
-					)
-				}&offset=${offset upBy PAGE_SIZE}", headers
-			)
-			tags.size == 1 -> loaderContext.httpGet(
-				"https://$domain/list/genre/${tags.first().key}?sortType=${
-					getSortKey(
-						sortOrder
-					)
-				}&offset=${offset upBy PAGE_SIZE}", headers
-			)
-			offset > 0 -> return emptyList()
-			else -> advancedSearch(domain, tags)
-		}.parseHtml().body()
-		val root = (doc.getElementById("mangaBox") ?: doc.getElementById("mangaResults"))
-			?.selectFirst("div.tiles.row") ?: throw ParseException("Cannot find root")
-		val baseHost = root.baseUri().toHttpUrl().host
-		return root.select("div.tile").mapNotNull { node ->
-			val imgDiv = node.selectFirst("div.img") ?: return@mapNotNull null
-			val descDiv = node.selectFirst("div.desc") ?: return@mapNotNull null
-			if (descDiv.selectFirst("i.fa-user") != null) {
-				return@mapNotNull null //skip author
-			}
-			val href = imgDiv.selectFirst("a")?.attr("href")?.inContextOf(node)
-			if (href == null || href.toHttpUrl().host != baseHost) {
-				return@mapNotNull null // skip external links
-			}
-			val title = descDiv.selectFirst("h3")?.selectFirst("a")?.text()
-				?: return@mapNotNull null
-			val tileInfo = descDiv.selectFirst("div.tile-info")
-			val relUrl = href.toRelativeUrl(baseHost)
-			Manga(
-				id = generateUid(relUrl),
-				url = relUrl,
-				publicUrl = href,
-				title = title,
-				altTitle = descDiv.selectFirst("h4")?.text(),
-				coverUrl = imgDiv.selectFirst("img.lazy")?.attr("data-original").orEmpty(),
-				rating = runCatching {
-					node.selectFirst("div.rating")
-						?.attr("title")
-						?.substringBefore(' ')
-						?.toFloatOrNull()
-						?.div(10f)
-				}.getOrNull() ?: Manga.NO_RATING,
-				author = tileInfo?.selectFirst("a.person-link")?.text(),
-				tags = runCatching {
-					tileInfo?.select("a.element-link")
-						?.mapToSet {
-							MangaTag(
-								title = it.text().toTitleCase(),
-								key = it.attr("href").substringAfterLast('/'),
-								source = source
-							)
-						}
-				}.getOrNull().orEmpty(),
-				state = when {
-					node.selectFirst("div.tags")
-						?.selectFirst("span.mangaCompleted") != null -> MangaState.FINISHED
-					else -> null
-				},
-				source = source
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.url.withDomain(), headers).parseHtml()
-		val root = doc.body().getElementById("mangaBox")?.selectFirst("div.leftContent")
-			?: throw ParseException("Cannot find root")
-		val dateFormat = SimpleDateFormat("dd.MM.yy", Locale.US)
-		val coverImg = root.selectFirst("div.subject-cover")?.selectFirst("img")
-		return manga.copy(
-			description = root.selectFirst("div.manga-description")?.html(),
-			largeCoverUrl = coverImg?.attr("data-full"),
-			coverUrl = coverImg?.attr("data-thumb") ?: manga.coverUrl,
-			tags = manga.tags + root.select("div.subject-meta").select("span.elem_genre ")
-				.mapNotNull {
-					val a = it.selectFirst("a.element-link") ?: return@mapNotNull null
-					MangaTag(
-						title = a.text().toTitleCase(),
-						key = a.attr("href").substringAfterLast('/'),
-						source = source
-					)
-				},
-			isNsfw = root.select(".alert-warning").any { it.ownText().contains(NSFW_ALERT) },
-			chapters = root.selectFirst("div.chapters-link")?.selectFirst("table")
-				?.select("tr:has(td > a)")?.asReversed()?.mapIndexedNotNull { i, tr ->
-					val a = tr.selectFirst("a") ?: return@mapIndexedNotNull null
-					val href = a.relUrl("href")
-					var translators = ""
-					val translatorElement = a.attr("title")
-					if (!translatorElement.isNullOrBlank()) {
-						translators = translatorElement
-							.replace("(Переводчик),", "&")
-							.removeSuffix(" (Переводчик)")
-					}
-					MangaChapter(
-						id = generateUid(href),
-						name = tr.selectFirst("a")?.text().orEmpty().removePrefix(manga.title).trim(),
-						number = i + 1,
-						url = href,
-						uploadDate = dateFormat.tryParse(tr.selectFirst("td.d-none")?.text()),
-						scanlator = translators,
-						source = source,
-						branch = null,
-					)
-				}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val doc = loaderContext.httpGet(chapter.url.withDomain() + "?mtr=1", headers).parseHtml()
-		val scripts = doc.select("script")
-		for (script in scripts) {
-			val data = script.html()
-			val pos = data.indexOf("rm_h.init")
-			if (pos == -1) {
-				continue
-			}
-			val json = data.substring(pos).substringAfter('[').substringBeforeLast(']')
-			val matches = Regex("\\[.*?]").findAll(json).toList()
-			val regex = Regex("['\"].*?['\"]")
-			return matches.map { x ->
-				val parts = regex.findAll(x.value).toList()
-				val url = parts[0].value.removeSurrounding('"', '\'') +
-						parts[2].value.removeSurrounding('"', '\'')
-				MangaPage(
-					id = generateUid(url),
-					url = url,
-					preview = null,
-					referer = chapter.url,
-					source = source,
-				)
-			}
-		}
-		throw ParseException("Pages list not found at ${chapter.url}")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}/list/genres/sort_name", headers).parseHtml()
-		val root = doc.body().getElementById("mangaBox")?.selectFirst("div.leftContent")
-			?.selectFirst("table.table") ?: parseFailed("Cannot find root")
-		return root.select("a.element-link").mapToSet { a ->
-			MangaTag(
-				title = a.text().toTitleCase(),
-				key = a.attr("href").substringAfterLast('/'),
-				source = source
-			)
-		}
-	}
-
-	private fun getSortKey(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
-			SortOrder.ALPHABETICAL -> "name"
-			SortOrder.POPULARITY -> "rate"
-			SortOrder.UPDATED -> "updated"
-			SortOrder.NEWEST -> "created"
-			SortOrder.RATING -> "votes"
-			null -> "updated"
-		}
-
-	private suspend fun advancedSearch(domain: String, tags: Set<MangaTag>): Response {
-		val url = "https://$domain/search/advanced"
-		// Step 1: map catalog genres names to advanced-search genres ids
-		val tagsIndex = loaderContext.httpGet(url, headers).parseHtml()
-			.body().selectFirst("form.search-form")
-			?.select("div.form-group")
-			?.get(1) ?: parseFailed("Genres filter element not found")
-		val tagNames = tags.map { it.title.lowercase() }
-		val payload = HashMap<String, String>()
-		var foundGenres = 0
-		tagsIndex.select("li.property").forEach { li ->
-			val name = li.text().trim().lowercase()
-			val id = li.selectFirst("input")?.id()
-				?: parseFailed("Id for tag $name not found")
-			payload[id] = if (name in tagNames) {
-				foundGenres++
-				"in"
-			} else ""
-		}
-		if (foundGenres != tags.size) {
-			parseFailed("Some genres are not found")
-		}
-		// Step 2: advanced search
-		payload["q"] = ""
-		payload["s_high_rate"] = ""
-		payload["s_single"] = ""
-		payload["s_mature"] = ""
-		payload["s_completed"] = ""
-		payload["s_translated"] = ""
-		payload["s_many_chapters"] = ""
-		payload["s_wait_upload"] = ""
-		payload["s_sale"] = ""
-		payload["years"] = "1900,2099"
-		payload["+"] = "Искать".urlEncoded()
-		return loaderContext.httpPost(url, payload)
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt
deleted file mode 100644
index 2c25870b9..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.utils.ext.mapToSet
-import org.koitharu.kotatsu.utils.ext.parseHtml
-import org.koitharu.kotatsu.utils.ext.toTitleCase
-
-class HenChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(loaderContext) {
-
-	override val defaultDomain = "hentaichan.live"
-	override val source = MangaSource.HENCHAN
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		return super.getList2(offset, query, tags, sortOrder).map {
-			it.copy(
-				coverUrl = it.coverUrl.replace("_blur", ""),
-				isNsfw = true,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
-		val root =
-			doc.body().getElementById("dle-content") ?: throw ParseException("Cannot find root")
-		val readLink = manga.url.replace("manga", "online")
-		return manga.copy(
-			description = root.getElementById("description")?.html()?.substringBeforeLast("<div"),
-			largeCoverUrl = root.getElementById("cover")?.absUrl("src"),
-			tags = root.selectFirst("div.sidetags")?.select("li.sidetag")?.mapToSet {
-				val a = it.children().last() ?: parseFailed("Invalid tag")
-				MangaTag(
-					title = a.text().toTitleCase(),
-					key = a.attr("href").substringAfterLast('/'),
-					source = source
-				)
-			} ?: manga.tags,
-			chapters = listOf(
-				MangaChapter(
-					id = generateUid(readLink),
-					url = readLink,
-					source = source,
-					number = 1,
-					uploadDate = 0L,
-					name = manga.title,
-					scanlator = null,
-					branch = null,
-				)
-			)
-		)
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HentaiLibRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HentaiLibRepository.kt
deleted file mode 100644
index c15eca844..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HentaiLibRepository.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.jsoup.nodes.Document
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class HentaiLibRepository(loaderContext: MangaLoaderContext) : MangaLibRepository(loaderContext) {
-
-	override val defaultDomain = "hentailib.me"
-
-	override val source = MangaSource.HENTAILIB
-
-	override fun isNsfw(doc: Document) = true
-}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaChanRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaChanRepository.kt
deleted file mode 100644
index f1ca82252..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaChanRepository.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class MangaChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(loaderContext) {
-
-	override val defaultDomain = "manga-chan.me"
-	override val source = MangaSource.MANGACHAN
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaDexRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaDexRepository.kt
deleted file mode 100644
index 57e57c025..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaDexRepository.kt
+++ /dev/null
@@ -1,216 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import android.os.Build
-import androidx.core.os.LocaleListCompat
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import org.json.JSONObject
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-private const val PAGE_SIZE = 20
-private const val CONTENT_RATING =
-	"contentRating[]=safe&contentRating[]=suggestive&contentRating[]=erotica&contentRating[]=pornographic"
-private const val LOCALE_FALLBACK = "en"
-
-class MangaDexRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.MANGADEX
-	override val defaultDomain = "mangadex.org"
-
-	override val sortOrders: EnumSet<SortOrder> = EnumSet.of(
-		SortOrder.UPDATED,
-		SortOrder.ALPHABETICAL,
-		SortOrder.NEWEST,
-		SortOrder.POPULARITY,
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?,
-	): List<Manga> {
-		val domain = getDomain()
-		val url = buildString {
-			append("https://api.")
-			append(domain)
-			append("/manga?limit=")
-			append(PAGE_SIZE)
-			append("&offset=")
-			append(offset)
-			append("&includes[]=cover_art&includes[]=author&includes[]=artist&")
-			tags?.forEach { tag ->
-				append("includedTags[]=")
-				append(tag.key)
-				append('&')
-			}
-			if (!query.isNullOrEmpty()) {
-				append("title=")
-				append(query.urlEncoded())
-				append('&')
-			}
-			append(CONTENT_RATING)
-			append("&order")
-			append(when (sortOrder) {
-				null,
-				SortOrder.UPDATED,
-				-> "[latestUploadedChapter]=desc"
-				SortOrder.ALPHABETICAL -> "[title]=asc"
-				SortOrder.NEWEST -> "[createdAt]=desc"
-				SortOrder.POPULARITY -> "[followedCount]=desc"
-				else -> "[followedCount]=desc"
-			})
-		}
-		val json = loaderContext.httpGet(url).parseJson().getJSONArray("data")
-		return json.map { jo ->
-			val id = jo.getString("id")
-			val attrs = jo.getJSONObject("attributes")
-			val relations = jo.getJSONArray("relationships").associateByKey("type")
-			val cover = relations["cover_art"]
-				?.getJSONObject("attributes")
-				?.getString("fileName")
-				?.let {
-					"https://uploads.$domain/covers/$id/$it"
-				}
-			Manga(
-				id = generateUid(id),
-				title = requireNotNull(attrs.getJSONObject("title").selectByLocale()) {
-					"Title should not be null"
-				},
-				altTitle = attrs.optJSONObject("altTitles")?.selectByLocale(),
-				url = id,
-				publicUrl = "https://$domain/title/$id",
-				rating = Manga.NO_RATING,
-				isNsfw = attrs.getStringOrNull("contentRating") == "erotica",
-				coverUrl = cover?.plus(".256.jpg").orEmpty(),
-				largeCoverUrl = cover,
-				description = attrs.optJSONObject("description")?.selectByLocale(),
-				tags = attrs.getJSONArray("tags").mapToSet { tag ->
-					MangaTag(
-						title = tag.getJSONObject("attributes")
-							.getJSONObject("name")
-							.firstStringValue()
-							.toTitleCase(),
-						key = tag.getString("id"),
-						source = source,
-					)
-				},
-				state = when (jo.getStringOrNull("status")) {
-					"ongoing" -> MangaState.ONGOING
-					"completed" -> MangaState.FINISHED
-					else -> null
-				},
-				author = (relations["author"] ?: relations["artist"])
-					?.getJSONObject("attributes")
-					?.getStringOrNull("name"),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope<Manga> {
-		val domain = getDomain()
-		val attrsDeferred = async {
-			loaderContext.httpGet(
-				"https://api.$domain/manga/${manga.url}?includes[]=artist&includes[]=author&includes[]=cover_art"
-			).parseJson().getJSONObject("data").getJSONObject("attributes")
-		}
-		val feedDeferred = async {
-			val url = buildString {
-				append("https://api.")
-				append(domain)
-				append("/manga/")
-				append(manga.url)
-				append("/feed")
-				append("?limit=96&includes[]=scanlation_group&order[volume]=asc&order[chapter]=asc&offset=0&")
-				append(CONTENT_RATING)
-			}
-			loaderContext.httpGet(url).parseJson().getJSONArray("data")
-		}
-		val mangaAttrs = attrsDeferred.await()
-		val feed = feedDeferred.await()
-		//2022-01-02T00:27:11+00:00
-		val dateFormat = SimpleDateFormat(
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-				"yyyy-MM-dd'T'HH:mm:ssX"
-			} else {
-				"yyyy-MM-dd'T'HH:mm:ss'+00:00'"
-			},
-			Locale.ROOT
-		)
-		manga.copy(
-			description = mangaAttrs.getJSONObject("description").selectByLocale()
-				?: manga.description,
-			chapters = feed.mapNotNull { jo ->
-				val id = jo.getString("id")
-				val attrs = jo.getJSONObject("attributes")
-				if (!attrs.isNull("externalUrl")) {
-					return@mapNotNull null
-				}
-				val locale = Locale.forLanguageTag(attrs.getString("translatedLanguage"))
-				val relations = jo.getJSONArray("relationships").associateByKey("type")
-				val number = attrs.optInt("chapter", 0)
-				MangaChapter(
-					id = generateUid(id),
-					name = attrs.getStringOrNull("title")?.takeUnless(String::isEmpty)
-						?: "Chapter #$number",
-					number = number,
-					url = id,
-					scanlator = relations["scanlation_group"]?.getStringOrNull("name"),
-					uploadDate = dateFormat.tryParse(attrs.getString("publishAt")),
-					branch = locale.getDisplayName(locale).toTitleCase(locale),
-					source = source,
-				)
-			}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val domain = getDomain()
-		val chapter = loaderContext.httpGet("https://api.$domain/at-home/server/${chapter.url}?forcePort443=false")
-			.parseJson()
-			.getJSONObject("chapter")
-		val pages = chapter.getJSONArray("data")
-		val prefix = "https://uploads.$domain/data/${chapter.getString("hash")}/"
-		val referer = "https://$domain/"
-		return List(pages.length()) { i ->
-			val url = prefix + pages.getString(i)
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				referer = referer,
-				preview = null, // TODO prefix + dataSaver.getString(i),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val tags = loaderContext.httpGet("https://api.${getDomain()}/manga/tag").parseJson()
-			.getJSONArray("data")
-		return tags.mapToSet { jo ->
-			MangaTag(
-				title = jo.getJSONObject("attributes").getJSONObject("name").firstStringValue().toTitleCase(),
-				key = jo.getString("id"),
-				source = source,
-			)
-		}
-	}
-
-	private fun JSONObject.firstStringValue() = values().next() as String
-
-	private fun JSONObject.selectByLocale(): String? {
-		val preferredLocales = LocaleListCompat.getAdjustedDefault()
-		repeat(preferredLocales.size()) { i ->
-			val locale = preferredLocales.get(i)
-			getStringOrNull(locale.language)?.let { return it }
-			getStringOrNull(locale.toLanguageTag())?.let { return it }
-		}
-		return getStringOrNull(LOCALE_FALLBACK) ?: values().nextOrNull() as? String
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt
deleted file mode 100644
index d25c7a959..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt
+++ /dev/null
@@ -1,274 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import androidx.collection.ArraySet
-import org.json.JSONArray
-import org.json.JSONObject
-import org.jsoup.nodes.Document
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-open class MangaLibRepository(loaderContext: MangaLoaderContext) :
-	RemoteMangaRepository(loaderContext), MangaRepositoryAuthProvider {
-
-	override val defaultDomain = "mangalib.me"
-
-	override val source = MangaSource.MANGALIB
-
-	override val authUrl: String
-		get() = "https://${getDomain()}/login"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.RATING,
-		SortOrder.ALPHABETICAL,
-		SortOrder.POPULARITY,
-		SortOrder.UPDATED,
-		SortOrder.NEWEST
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		if (!query.isNullOrEmpty()) {
-			return if (offset == 0) search(query) else emptyList()
-		}
-		val page = (offset / 60f).toIntUp()
-		val url = buildString {
-			append("https://")
-			append(getDomain())
-			append("/manga-list?dir=")
-			append(getSortKey(sortOrder))
-			append("&page=")
-			append(page)
-			tags?.forEach { tag ->
-				append("&genres[include][]=")
-				append(tag.key)
-			}
-		}
-		val doc = loaderContext.httpGet(url).parseHtml()
-		val root = doc.body().getElementById("manga-list") ?: throw ParseException("Root not found")
-		val items = root.selectFirst("div.media-cards-grid")?.select("div.media-card-wrap")
-			?: return emptyList()
-		return items.mapNotNull { card ->
-			val a = card.selectFirst("a.media-card") ?: return@mapNotNull null
-			val href = a.relUrl("href")
-			Manga(
-				id = generateUid(href),
-				title = card.selectFirst("h3")?.text().orEmpty(),
-				coverUrl = a.absUrl("data-src"),
-				altTitle = null,
-				author = null,
-				rating = Manga.NO_RATING,
-				url = href,
-				publicUrl = href.inContextOf(a),
-				tags = emptySet(),
-				state = null,
-				source = source
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val fullUrl = manga.url.withDomain()
-		val doc = loaderContext.httpGet("$fullUrl?section=info").parseHtml()
-		val root = doc.body().getElementById("main-page") ?: throw ParseException("Root not found")
-		val title = root.selectFirst("div.media-header__wrap")?.children()
-		val info = root.selectFirst("div.media-content")
-		val chaptersDoc = loaderContext.httpGet("$fullUrl?section=chapters").parseHtml()
-		val scripts = chaptersDoc.select("script")
-		val dateFormat = SimpleDateFormat("yyy-MM-dd", Locale.US)
-		var chapters: ArrayList<MangaChapter>? = null
-		scripts@ for (script in scripts) {
-			val raw = script.html().lines()
-			for (line in raw) {
-				if (line.startsWith("window.__DATA__")) {
-					val json = JSONObject(line.substringAfter('=').substringBeforeLast(';'))
-					val list = json.getJSONObject("chapters").getJSONArray("list")
-					val total = list.length()
-					chapters = ArrayList(total)
-					for (i in 0 until total) {
-						val item = list.getJSONObject(i)
-						val chapterId = item.getLong("chapter_id")
-						val scanlator = item.getStringOrNull("username")
-						val url = buildString {
-							append(manga.url)
-							append("/v")
-							append(item.getInt("chapter_volume"))
-							append("/c")
-							append(item.getString("chapter_number"))
-							@Suppress("BlockingMethodInNonBlockingContext") // lint issue
-							append('/')
-							append(item.optString("chapter_string"))
-						}
-						val nameChapter = item.getStringOrNull("chapter_name")
-						val volume = item.getInt("chapter_volume")
-						val number = item.getString("chapter_number")
-						val fullNameChapter = "Том $volume. Глава $number"
-						chapters.add(
-							MangaChapter(
-								id = generateUid(chapterId),
-								url = url,
-								source = source,
-								number = total - i,
-								uploadDate = dateFormat.tryParse(
-									item.getString("chapter_created_at").substringBefore(" ")
-								),
-								scanlator = scanlator,
-								branch = null,
-								name = if (nameChapter.isNullOrBlank()) fullNameChapter else "$fullNameChapter - $nameChapter",
-							)
-						)
-					}
-					chapters.reverse()
-					break@scripts
-				}
-			}
-		}
-		return manga.copy(
-			title = title?.getOrNull(0)?.text()?.takeUnless(String::isBlank) ?: manga.title,
-			altTitle = title?.getOrNull(1)?.text()?.substringBefore('/')?.trim(),
-			rating = root.selectFirst("div.media-stats-item__score")
-				?.selectFirst("span")
-				?.text()?.toFloatOrNull()?.div(5f) ?: manga.rating,
-			author = info?.getElementsMatchingOwnText("Автор")?.firstOrNull()
-				?.nextElementSibling()?.text() ?: manga.author,
-			tags = info?.selectFirst("div.media-tags")
-				?.select("a.media-tag-item")?.mapToSet { a ->
-					MangaTag(
-						title = a.text().toTitleCase(),
-						key = a.attr("href").substringAfterLast('='),
-						source = source
-					)
-				} ?: manga.tags,
-			isNsfw = isNsfw(doc),
-			description = info?.selectFirst("div.media-description__text")?.html(),
-			chapters = chapters
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		if (doc.location().endsWith("/register")) {
-			throw AuthRequiredException(source)
-		}
-		val scripts = doc.head().select("script")
-		val pg = (doc.body().getElementById("pg")?.html() ?: parseFailed("Element #pg not found"))
-			.substringAfter('=')
-			.substringBeforeLast(';')
-		val pages = JSONArray(pg)
-		for (script in scripts) {
-			val raw = script.html().trim()
-			if (raw.contains("window.__info")) {
-				val json = JSONObject(
-					raw.substringAfter("window.__info")
-						.substringAfter('=')
-						.substringBeforeLast(';')
-				)
-				val domain = json.getJSONObject("servers").run {
-					getStringOrNull("main") ?: getString(
-						json.getJSONObject("img").getString("server")
-					)
-				}
-				val url = json.getJSONObject("img").getString("url")
-				return pages.map { x ->
-					val pageUrl = "$domain/$url${x.getString("u")}"
-					MangaPage(
-						id = generateUid(pageUrl),
-						url = pageUrl,
-						preview = null,
-						referer = fullUrl,
-						source = source,
-					)
-				}
-			}
-		}
-		throw ParseException("Script with info not found")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val url = "https://${getDomain()}/manga-list"
-		val doc = loaderContext.httpGet(url).parseHtml()
-		val scripts = doc.body().select("script")
-		for (script in scripts) {
-			val raw = script.html().trim()
-			if (raw.startsWith("window.__DATA")) {
-				val json = JSONObject(raw.substringAfter('=').substringBeforeLast(';'))
-				val genres = json.getJSONObject("filters").getJSONArray("genres")
-				val result = ArraySet<MangaTag>(genres.length())
-				for (x in genres) {
-					result += MangaTag(
-						source = source,
-						key = x.getInt("id").toString(),
-						title = x.getString("name").toTitleCase(),
-					)
-				}
-				return result
-			}
-		}
-		throw ParseException("Script with genres not found")
-	}
-
-	override fun isAuthorized(): Boolean {
-		return loaderContext.cookieJar.getCookies(getDomain()).any {
-			it.name.startsWith("remember_web_")
-		}
-	}
-
-	override suspend fun getUsername(): String {
-		val body = loaderContext.httpGet("https://${getDomain()}/messages").parseHtml().body()
-		if (body.baseUri().endsWith("/login")) {
-			throw AuthRequiredException(source)
-		}
-		return body.selectFirst(".profile-user__username")?.text() ?: parseFailed("Cannot find username")
-	}
-
-	protected open fun isNsfw(doc: Document): Boolean {
-		val sidebar = doc.body().selectFirst(".media-sidebar") ?: parseFailed("Sidebar not found")
-		return sidebar.getElementsContainingOwnText("18+").isNotEmpty()
-	}
-
-	private fun getSortKey(sortOrder: SortOrder?) = when (sortOrder) {
-		SortOrder.RATING -> "desc&sort=rate"
-		SortOrder.ALPHABETICAL -> "asc&sort=name"
-		SortOrder.POPULARITY -> "desc&sort=views"
-		SortOrder.UPDATED -> "desc&sort=last_chapter_at"
-		SortOrder.NEWEST -> "desc&sort=created_at"
-		else -> "desc&sort=last_chapter_at"
-	}
-
-	private suspend fun search(query: String): List<Manga> {
-		val domain = getDomain()
-		val json = loaderContext.httpGet("https://$domain/search?type=manga&q=$query")
-			.parseJsonArray()
-		return json.map { jo ->
-			val slug = jo.getString("slug")
-			val url = "/$slug"
-			val covers = jo.getJSONObject("covers")
-			Manga(
-				id = generateUid(url),
-				url = url,
-				publicUrl = "https://$domain/$slug",
-				title = jo.getString("rus_name"),
-				altTitle = jo.getString("name"),
-				author = null,
-				tags = emptySet(),
-				rating = jo.getString("rate_avg")
-					.toFloatOrNull()?.div(5f) ?: Manga.NO_RATING,
-				state = null,
-				source = source,
-				coverUrl = covers.getString("thumbnail"),
-				largeCoverUrl = covers.getString("default")
-			)
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaOwlRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaOwlRepository.kt
deleted file mode 100644
index a9c0030d2..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaOwlRepository.kt
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import android.util.Base64
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-class MangaOwlRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.MANGAOWL
-
-	override val defaultDomain = "mangaowls.com"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.POPULARITY,
-		SortOrder.NEWEST,
-		SortOrder.UPDATED
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?,
-	): List<Manga> {
-		val page = (offset / 36f).toIntUp().inc()
-		val link = buildString {
-			append("https://")
-			append(getDomain())
-			when {
-				!query.isNullOrEmpty() -> {
-					append("/search/${page}?search=")
-					append(query.urlEncoded())
-				}
-				!tags.isNullOrEmpty() -> {
-					for (tag in tags) {
-						append(tag.key)
-					}
-					append("/${page}?type=${getAlternativeSortKey(sortOrder)}")
-				}
-				else -> {
-					append("/${getSortKey(sortOrder)}/${page}")
-				}
-			}
-		}
-		val doc = loaderContext.httpGet(link).parseHtml()
-		val slides = doc.body().select("ul.slides") ?: parseFailed("An error occurred while parsing")
-		val items = slides.select("div.col-md-2")
-		return items.mapNotNull { item ->
-			val href = item.selectFirst("h6 a")?.relUrl("href") ?: return@mapNotNull null
-			Manga(
-				id = generateUid(href),
-				title = item.selectFirst("h6 a")?.text() ?: return@mapNotNull null,
-				coverUrl = item.select("div.img-responsive").attr("abs:data-background-image"),
-				altTitle = null,
-				author = null,
-				rating = runCatching {
-					item.selectFirst("div.block-stars")
-						?.text()
-						?.toFloatOrNull()
-						?.div(10f)
-				}.getOrNull() ?: Manga.NO_RATING,
-				url = href,
-				publicUrl = href.withDomain(),
-				source = source
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.publicUrl).parseHtml()
-		val info = doc.body().selectFirst("div.single_detail") ?: parseFailed("An error occurred while parsing")
-		val table = doc.body().selectFirst("div.single-grid-right") ?: parseFailed("An error occurred while parsing")
-		val dateFormat = SimpleDateFormat("MM/dd/yyyy", Locale.US)
-		val trRegex = "window\\['tr'] = '([^']*)';".toRegex(RegexOption.IGNORE_CASE)
-		val trElement = doc.getElementsByTag("script").find { trRegex.find(it.data()) != null } ?: parseFailed("Oops, tr not found")
-		val tr = trRegex.find(trElement.data())!!.groups[1]!!.value
-		val s = Base64.encodeToString(defaultDomain.toByteArray(), Base64.NO_PADDING)
-		return manga.copy(
-			description = info.selectFirst(".description")?.html(),
-			largeCoverUrl = info.select("img").first()?.let { img ->
-				if (img.hasAttr("data-src")) img.attr("abs:data-src") else img.attr("abs:src")
-			},
-			author = info.selectFirst("p.fexi_header_para a.author_link")?.text(),
-			state = parseStatus(info.select("p.fexi_header_para:contains(status)").first()?.ownText()),
-			tags = manga.tags + info.select("div.col-xs-12.col-md-8.single-right-grid-right > p > a[href*=genres]")
-				.mapNotNull {
-					val a = it.selectFirst("a") ?: return@mapNotNull null
-					MangaTag(
-						title = a.text().toTitleCase(),
-						key = a.attr("href"),
-						source = source
-					)
-				},
-			chapters = table.select("div.table.table-chapter-list").select("li.list-group-item.chapter_list").asReversed().mapIndexed { i, li ->
-				val a = li.select("a")
-				val href = a.attr("data-href").ifEmpty {
-					parseFailed("Link is missing")
-				}
-				MangaChapter(
-					id = generateUid(href),
-					name = a.select("label").text(),
-					number = i + 1,
-					url = "$href?tr=$tr&s=$s",
-					scanlator = null,
-					branch = null,
-					uploadDate = dateFormat.tryParse(li.selectFirst("small:last-of-type")?.text()),
-					source = MangaSource.MANGAOWL,
-				)
-			}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		val root = doc.body().select("div.item img.owl-lazy") ?: throw ParseException("Root not found")
-		return root.map { div ->
-			val url = div?.relUrl("data-src") ?: parseFailed("Page image not found")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				referer = url,
-				source = MangaSource.MANGAOWL,
-			)
-		}
-	}
-
-	private fun parseStatus(status: String?) = when {
-		status == null -> null
-		status.contains("Ongoing") -> MangaState.ONGOING
-		status.contains("Completed") -> MangaState.FINISHED
-		else -> null
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}/").parseHtml()
-		val root = doc.body().select("ul.dropdown-menu.multi-column.columns-3").select("li")
-		return root.mapToSet { p ->
-			val a = p.selectFirst("a") ?: parseFailed("a is null")
-			MangaTag(
-				title = a.text().toTitleCase(),
-				key = a.attr("href"),
-				source = source
-			)
-		}
-	}
-
-	private fun getSortKey(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
-			SortOrder.POPULARITY -> "popular"
-			SortOrder.NEWEST -> "new_release"
-			SortOrder.UPDATED -> "lastest"
-			else -> "lastest"
-		}
-
-	private fun getAlternativeSortKey(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
-			SortOrder.POPULARITY -> "0"
-			SortOrder.NEWEST -> "2"
-			SortOrder.UPDATED -> "3"
-			else -> "3"
-		}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt
deleted file mode 100644
index 30109513c..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.core.prefs.SourceSettings
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-
-class MangaTownRepository(loaderContext: MangaLoaderContext) :
-	RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.MANGATOWN
-
-	override val defaultDomain = "www.mangatown.com"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.ALPHABETICAL,
-		SortOrder.RATING,
-		SortOrder.POPULARITY,
-		SortOrder.UPDATED
-	)
-
-	private val regexTag = Regex("[^\\-]+-[^\\-]+-[^\\-]+-[^\\-]+-[^\\-]+-[^\\-]+")
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		val sortKey = when (sortOrder) {
-			SortOrder.ALPHABETICAL -> "?name.az"
-			SortOrder.RATING -> "?rating.za"
-			SortOrder.UPDATED -> "?last_chapter_time.za"
-			else -> ""
-		}
-		val page = (offset / 30) + 1
-		val url = when {
-			!query.isNullOrEmpty() -> {
-				if (offset != 0) {
-					return emptyList()
-				}
-				"/search?name=${query.urlEncoded()}".withDomain()
-			}
-			tags.isNullOrEmpty() -> "/directory/$page.htm$sortKey".withDomain()
-			tags.size == 1 -> "/directory/${tags.first().key}/$page.htm$sortKey".withDomain()
-			else -> tags.joinToString(
-				prefix = "/search?page=$page".withDomain()
-			) { tag ->
-				"&genres[${tag.key}]=1"
-			}
-		}
-		val doc = loaderContext.httpGet(url).parseHtml()
-		val root = doc.body().selectFirst("ul.manga_pic_list")
-			?: throw ParseException("Root not found")
-		return root.select("li").mapNotNull { li ->
-			val a = li.selectFirst("a.manga_cover")
-			val href = a?.relUrl("href")
-				?: return@mapNotNull null
-			val views = li.select("p.view")
-			val status = views.findOwnText { x -> x.startsWith("Status:") }
-				?.substringAfter(':')?.trim()?.lowercase(Locale.ROOT)
-			Manga(
-				id = generateUid(href),
-				title = a.attr("title"),
-				coverUrl = a.selectFirst("img")?.absUrl("src").orEmpty(),
-				source = MangaSource.MANGATOWN,
-				altTitle = null,
-				rating = li.selectFirst("p.score")?.selectFirst("b")
-					?.ownText()?.toFloatOrNull()?.div(5f) ?: Manga.NO_RATING,
-				author = views.findText { x -> x.startsWith("Author:") }?.substringAfter(':')
-					?.trim(),
-				state = when (status) {
-					"ongoing" -> MangaState.ONGOING
-					"completed" -> MangaState.FINISHED
-					else -> null
-				},
-				tags = li.selectFirst("p.keyWord")?.select("a")?.mapNotNullToSet tags@{ x ->
-					MangaTag(
-						title = x.attr("title").toTitleCase(),
-						key = x.attr("href").parseTagKey() ?: return@tags null,
-						source = MangaSource.MANGATOWN
-					)
-				}.orEmpty(),
-				url = href,
-				publicUrl = href.inContextOf(a)
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
-		val root = doc.body().selectFirst("section.main")
-			?.selectFirst("div.article_content") ?: throw ParseException("Cannot find root")
-		val info = root.selectFirst("div.detail_info")?.selectFirst("ul")
-		val chaptersList = root.selectFirst("div.chapter_content")
-			?.selectFirst("ul.chapter_list")?.select("li")?.asReversed()
-		val dateFormat = SimpleDateFormat("MMM dd,yyyy", Locale.US)
-		return manga.copy(
-			tags = manga.tags + info?.select("li")?.find { x ->
-				x.selectFirst("b")?.ownText() == "Genre(s):"
-			}?.select("a")?.mapNotNull { a ->
-				MangaTag(
-					title = a.attr("title").toTitleCase(),
-					key = a.attr("href").parseTagKey() ?: return@mapNotNull null,
-					source = MangaSource.MANGATOWN
-				)
-			}.orEmpty(),
-			description = info?.getElementById("show")?.ownText(),
-			chapters = chaptersList?.mapIndexedNotNull { i, li ->
-				val href = li.selectFirst("a")?.relUrl("href")
-					?: return@mapIndexedNotNull null
-				val name = li.select("span").filter { it.className().isEmpty() }
-					.joinToString(" - ") { it.text() }.trim()
-				MangaChapter(
-					id = generateUid(href),
-					url = href,
-					source = MangaSource.MANGATOWN,
-					number = i + 1,
-					uploadDate = parseChapterDate(
-						dateFormat,
-						li.selectFirst("span.time")?.text()
-					),
-					name = name.ifEmpty { "${manga.title} - ${i + 1}" },
-					scanlator = null,
-					branch = null,
-				)
-			} ?: bypassLicensedChapters(manga)
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		val root = doc.body().selectFirst("div.page_select")
-			?: throw ParseException("Cannot find root")
-		return root.selectFirst("select")?.select("option")?.mapNotNull {
-			val href = it.relUrl("value")
-			if (href.endsWith("featured.html")) {
-				return@mapNotNull null
-			}
-			MangaPage(
-				id = generateUid(href),
-				url = href,
-				preview = null,
-				referer = fullUrl,
-				source = MangaSource.MANGATOWN,
-			)
-		} ?: parseFailed("Pages list not found")
-	}
-
-	override suspend fun getPageUrl(page: MangaPage): String {
-		val doc = loaderContext.httpGet(page.url.withDomain()).parseHtml()
-		return doc.getElementById("image")?.absUrl("src") ?: parseFailed("Image not found")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("/directory/".withDomain()).parseHtml()
-		val root = doc.body().selectFirst("aside.right")
-			?.getElementsContainingOwnText("Genres")
-			?.first()
-			?.nextElementSibling() ?: parseFailed("Root not found")
-		return root.select("li").mapNotNullToSet { li ->
-			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
-			val key = a.attr("href").parseTagKey()
-			if (key.isNullOrEmpty()) {
-				return@mapNotNullToSet null
-			}
-			MangaTag(
-				source = MangaSource.MANGATOWN,
-				key = key,
-				title = a.text().toTitleCase()
-			)
-		}
-	}
-
-	private fun parseChapterDate(dateFormat: DateFormat, date: String?): Long {
-		return when {
-			date.isNullOrEmpty() -> 0L
-			date.contains("Today") -> Calendar.getInstance().timeInMillis
-			date.contains("Yesterday") -> Calendar.getInstance().apply { add(Calendar.DAY_OF_MONTH, -1) }.timeInMillis
-			else -> dateFormat.tryParse(date)
-		}
-	}
-
-	override fun onCreatePreferences(map: MutableMap<String, Any>) {
-		super.onCreatePreferences(map)
-		map[SourceSettings.KEY_USE_SSL] = true
-	}
-
-	private suspend fun bypassLicensedChapters(manga: Manga): List<MangaChapter> {
-		val doc = loaderContext.httpGet(manga.url.withDomain("m")).parseHtml()
-		val list = doc.body().selectFirst("ul.detail-ch-list") ?: return emptyList()
-		val dateFormat = SimpleDateFormat("MMM dd,yyyy", Locale.US)
-		return list.select("li").asReversed().mapIndexedNotNull { i, li ->
-			val a = li.selectFirst("a") ?: return@mapIndexedNotNull null
-			val href = a.relUrl("href")
-			val name = a.selectFirst("span.vol")?.text().orEmpty().ifEmpty {
-				a.ownText()
-			}
-			MangaChapter(
-				id = generateUid(href),
-				url = href,
-				source = MangaSource.MANGATOWN,
-				number = i + 1,
-				uploadDate = parseChapterDate(
-					dateFormat,
-					li.selectFirst("span.time")?.text()
-				),
-				name = name.ifEmpty { "${manga.title} - ${i + 1}" },
-				scanlator = null,
-				branch = null,
-			)
-		}
-	}
-
-	private fun String.parseTagKey() = split('/').findLast { regexTag matches it }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt
deleted file mode 100644
index 70c51b4cf..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt
+++ /dev/null
@@ -1,242 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.WordSet
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-
-private const val PAGE_SIZE = 12
-
-class MangareadRepository(
-	loaderContext: MangaLoaderContext
-) : RemoteMangaRepository(loaderContext) {
-
-	override val source = MangaSource.MANGAREAD
-
-	override val defaultDomain = "www.mangaread.org"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.UPDATED,
-		SortOrder.POPULARITY
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		val tag = when {
-			tags.isNullOrEmpty() -> null
-			tags.size == 1 -> tags.first()
-			else -> throw NotImplementedError("Multiple genres are not supported by this source")
-		}
-		val payload = createRequestTemplate()
-		payload["page"] = (offset / PAGE_SIZE.toFloat()).toIntUp().toString()
-		payload["vars[meta_key]"] = when (sortOrder) {
-			SortOrder.POPULARITY -> "_wp_manga_views"
-			SortOrder.UPDATED -> "_latest_update"
-			else -> "_wp_manga_views"
-		}
-		payload["vars[wp-manga-genre]"] = tag?.key.orEmpty()
-		payload["vars[s]"] = query.orEmpty()
-		val doc = loaderContext.httpPost(
-			"https://${getDomain()}/wp-admin/admin-ajax.php",
-			payload
-		).parseHtml()
-		return doc.select("div.row.c-tabs-item__content").map { div ->
-			val href = div.selectFirst("a")?.relUrl("href")
-				?: parseFailed("Link not found")
-			val summary = div.selectFirst(".tab-summary")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.inContextOf(div),
-				coverUrl = div.selectFirst("img")?.absUrl("data-src").orEmpty(),
-				title = summary?.selectFirst("h3")?.text().orEmpty(),
-				rating = div.selectFirst("span.total_votes")?.ownText()
-					?.toFloatOrNull()?.div(5f) ?: -1f,
-				tags = summary?.selectFirst(".mg_genres")?.select("a")?.mapToSet { a ->
-					MangaTag(
-						key = a.attr("href").removeSuffix("/").substringAfterLast('/'),
-						title = a.text().toTitleCase(),
-						source = MangaSource.MANGAREAD
-					)
-				}.orEmpty(),
-				author = summary?.selectFirst(".mg_author")?.selectFirst("a")?.ownText(),
-				state = when (summary?.selectFirst(".mg_status")?.selectFirst(".summary-content")
-					?.ownText()?.trim()) {
-					"OnGoing" -> MangaState.ONGOING
-					"Completed" -> MangaState.FINISHED
-					else -> null
-				},
-				source = MangaSource.MANGAREAD
-			)
-		}
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}/manga/").parseHtml()
-		val root = doc.body().selectFirst("header")
-			?.selectFirst("ul.second-menu") ?: parseFailed("Root not found")
-		return root.select("li").mapNotNullToSet { li ->
-			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
-			val href = a.attr("href").removeSuffix("/")
-				.substringAfterLast("genres/", "")
-			if (href.isEmpty()) {
-				return@mapNotNullToSet null
-			}
-			MangaTag(
-				key = href,
-				title = a.text().toTitleCase(),
-				source = MangaSource.MANGAREAD
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val fullUrl = manga.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		val root = doc.body().selectFirst("div.profile-manga")
-			?.selectFirst("div.summary_content")
-			?.selectFirst("div.post-content")
-			?: throw ParseException("Root not found")
-		val root2 = doc.body().selectFirst("div.content-area")
-			?.selectFirst("div.c-page")
-			?: throw ParseException("Root2 not found")
-		val dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale.US)
-		return manga.copy(
-			tags = root.selectFirst("div.genres-content")?.select("a")
-				?.mapNotNullToSet { a ->
-					MangaTag(
-						key = a.attr("href").removeSuffix("/").substringAfterLast('/'),
-						title = a.text().toTitleCase(),
-						source = MangaSource.MANGAREAD
-					)
-				} ?: manga.tags,
-			description = root2.selectFirst("div.description-summary")
-				?.selectFirst("div.summary__content")
-				?.select("p")
-				?.filterNot { it.ownText().startsWith("A brief description") }
-				?.joinToString { it.html() },
-			chapters = root2.select("li").asReversed().mapIndexed { i, li ->
-				val a = li.selectFirst("a")
-				val href = a?.relUrl("href").orEmpty().ifEmpty {
-					parseFailed("Link is missing")
-				}
-				MangaChapter(
-					id = generateUid(href),
-					name = a!!.ownText(),
-					number = i + 1,
-					url = href,
-					uploadDate = parseChapterDate(
-						dateFormat,
-						li.selectFirst("span.chapter-release-date i")?.text()
-					),
-					source = MangaSource.MANGAREAD,
-					scanlator = null,
-					branch = null,
-				)
-			}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		val root = doc.body().selectFirst("div.main-col-inner")
-			?.selectFirst("div.reading-content")
-			?: throw ParseException("Root not found")
-		return root.select("div.page-break").map { div ->
-			val img = div.selectFirst("img") ?: parseFailed("Page image not found")
-			val url = img.relUrl("data-src").ifEmpty {
-				img.relUrl("src")
-			}
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				referer = fullUrl,
-				source = MangaSource.MANGAREAD,
-			)
-		}
-	}
-
-	private fun parseChapterDate(dateFormat: DateFormat, date: String?): Long {
-
-		date ?: return 0
-		return when {
-			date.endsWith(" ago", ignoreCase = true) -> {
-				parseRelativeDate(date)
-			}
-			// Handle translated 'ago' in Portuguese.
-			date.endsWith(" atrás", ignoreCase = true) -> {
-				parseRelativeDate(date)
-			}
-			// Handle translated 'ago' in Turkish.
-			date.endsWith(" önce", ignoreCase = true) -> {
-				parseRelativeDate(date)
-			}
-			// Handle 'yesterday' and 'today', using midnight
-			date.startsWith("year", ignoreCase = true) -> {
-				Calendar.getInstance().apply {
-					add(Calendar.DAY_OF_MONTH, -1) // yesterday
-					set(Calendar.HOUR_OF_DAY, 0)
-					set(Calendar.MINUTE, 0)
-					set(Calendar.SECOND, 0)
-					set(Calendar.MILLISECOND, 0)
-				}.timeInMillis
-			}
-			date.startsWith("today", ignoreCase = true) -> {
-				Calendar.getInstance().apply {
-					set(Calendar.HOUR_OF_DAY, 0)
-					set(Calendar.MINUTE, 0)
-					set(Calendar.SECOND, 0)
-					set(Calendar.MILLISECOND, 0)
-				}.timeInMillis
-			}
-			date.contains(Regex("""\d(st|nd|rd|th)""")) -> {
-				// Clean date (e.g. 5th December 2019 to 5 December 2019) before parsing it
-				date.split(" ").map {
-					if (it.contains(Regex("""\d\D\D"""))) {
-						it.replace(Regex("""\D"""), "")
-					} else {
-						it
-					}
-				}
-					.let { dateFormat.tryParse(it.joinToString(" ")) }
-			}
-			else -> dateFormat.tryParse(date)
-		}
-	}
-
-	// Parses dates in this form:
-	// 21 hours ago
-	private fun parseRelativeDate(date: String): Long {
-		val number = Regex("""(\d+)""").find(date)?.value?.toIntOrNull() ?: return 0
-		val cal = Calendar.getInstance()
-
-		return when {
-			WordSet("hari", "gün", "jour", "día", "dia", "day").anyWordIn(date) -> cal.apply { add(Calendar.DAY_OF_MONTH, -number) }.timeInMillis
-			WordSet("jam", "saat", "heure", "hora", "hour").anyWordIn(date) -> cal.apply { add(Calendar.HOUR, -number) }.timeInMillis
-			WordSet("menit", "dakika", "min", "minute", "minuto").anyWordIn(date) -> cal.apply { add(Calendar.MINUTE, -number) }.timeInMillis
-			WordSet("detik", "segundo", "second").anyWordIn(date) -> cal.apply { add(Calendar.SECOND, -number) }.timeInMillis
-			WordSet("month").anyWordIn(date) -> cal.apply { add(Calendar.MONTH, -number) }.timeInMillis
-			WordSet("year").anyWordIn(date) -> cal.apply { add(Calendar.YEAR, -number) }.timeInMillis
-			else -> 0
-		}
-	}
-
-	private fun createRequestTemplate() =
-		"action=madara_load_more&page=1&template=madara-core%2Fcontent%2Fcontent-search&vars%5Bs%5D=&vars%5Borderby%5D=meta_value_num&vars%5Bpaged%5D=1&vars%5Btemplate%5D=search&vars%5Bmeta_query%5D%5B0%5D%5Brelation%5D=AND&vars%5Bmeta_query%5D%5Brelation%5D=OR&vars%5Bpost_type%5D=wp-manga&vars%5Bpost_status%5D=publish&vars%5Bmeta_key%5D=_latest_update&vars%5Border%5D=desc&vars%5Bmanga_archives_item_layout%5D=default"
-			.split('&')
-			.map {
-				val pos = it.indexOf('=')
-				it.substring(0, pos) to it.substring(pos + 1)
-			}.toMutableMap()
-}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MintMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MintMangaRepository.kt
deleted file mode 100644
index 18bc10626..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MintMangaRepository.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class MintMangaRepository(loaderContext: MangaLoaderContext) : GroupleRepository(loaderContext) {
-
-	override val source = MangaSource.MINTMANGA
-	override val defaultDomain: String = "mintmanga.live"
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt
deleted file mode 100644
index 3b94821c5..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt
+++ /dev/null
@@ -1,251 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-private const val PAGE_SIZE = 26
-
-abstract class NineMangaRepository(
-	loaderContext: MangaLoaderContext,
-	override val source: MangaSource,
-	override val defaultDomain: String,
-) : RemoteMangaRepository(loaderContext) {
-
-	init {
-		loaderContext.cookieJar.insertCookies(getDomain(), "ninemanga_template_desk=yes")
-	}
-
-	private val headers = Headers.Builder()
-		.add("Accept-Language", "en-US;q=0.7,en;q=0.3")
-		.build()
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.POPULARITY,
-	)
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		val page = (offset / PAGE_SIZE.toFloat()).toIntUp() + 1
-		val url = buildString {
-			append("https://")
-			append(getDomain())
-			when {
-				!query.isNullOrEmpty() -> {
-					append("/search/?name_sel=&wd=")
-					append(query.urlEncoded())
-					append("&page=")
-				}
-				!tags.isNullOrEmpty() -> {
-					append("/search/?category_id=")
-					for (tag in tags) {
-						append(tag.key)
-						append(',')
-					}
-					append("&page=")
-				}
-				else -> {
-					append("/category/index_")
-				}
-			}
-			append(page)
-			append(".html")
-		}
-		val doc = loaderContext.httpGet(url, headers).parseHtml()
-		val root = doc.body().selectFirst("ul.direlist")
-			?: throw ParseException("Cannot find root")
-		val baseHost = root.baseUri().toHttpUrl().host
-		return root.select("li").map { node ->
-			val href = node.selectFirst("a")?.absUrl("href")
-				?: parseFailed("Link not found")
-			val relUrl = href.toRelativeUrl(baseHost)
-			val dd = node.selectFirst("dd")
-			Manga(
-				id = generateUid(relUrl),
-				url = relUrl,
-				publicUrl = href,
-				title = dd?.selectFirst("a.bookname")?.text()?.toCamelCase().orEmpty(),
-				altTitle = null,
-				coverUrl = node.selectFirst("img")?.absUrl("src").orEmpty(),
-				rating = Manga.NO_RATING,
-				author = null,
-				tags = emptySet(),
-				state = null,
-				source = source,
-				description = dd?.selectFirst("p")?.html(),
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(
-			manga.url.withDomain() + "?waring=1",
-			headers
-		).parseHtml()
-		val root = doc.body().selectFirst("div.manga")
-			?: throw ParseException("Cannot find root")
-		val infoRoot = root.selectFirst("div.bookintro")
-			?: throw ParseException("Cannot find info")
-		return manga.copy(
-			tags = infoRoot.getElementsByAttributeValue("itemprop", "genre").first()
-				?.select("a")?.mapToSet { a ->
-					MangaTag(
-						title = a.text().toTitleCase(),
-						key = a.attr("href").substringBetween("/", "."),
-						source = source,
-					)
-				}.orEmpty(),
-			author = infoRoot.getElementsByAttributeValue("itemprop", "author").first()?.text(),
-			state = parseStatus(infoRoot.select("li a.red").text()),
-			description = infoRoot.getElementsByAttributeValue("itemprop", "description").first()
-				?.html()?.substringAfter("</b>"),
-			chapters = root.selectFirst("div.chapterbox")?.select("ul.sub_vol_ul > li")
-				?.asReversed()?.mapIndexed { i, li ->
-					val a = li.selectFirst("a.chapter_list_a")
-					val href = a?.relUrl("href")?.replace("%20", " ") ?: parseFailed("Link not found")
-					MangaChapter(
-						id = generateUid(href),
-						name = a.text(),
-						number = i + 1,
-						url = href,
-						uploadDate = parseChapterDateByLang(li.selectFirst("span")?.text().orEmpty()),
-						source = source,
-						scanlator = null,
-						branch = null,
-					)
-				}
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val doc = loaderContext.httpGet(chapter.url.withDomain(), headers).parseHtml()
-		return doc.body().getElementById("page")?.select("option")?.map { option ->
-			val url = option.attr("value")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				referer = chapter.url.withDomain(),
-				preview = null,
-				source = source,
-			)
-		} ?: throw ParseException("Pages list not found at ${chapter.url}")
-	}
-
-	override suspend fun getPageUrl(page: MangaPage): String {
-		val doc = loaderContext.httpGet(page.url.withDomain(), headers).parseHtml()
-		val root = doc.body()
-		return root.selectFirst("a.pic_download")?.absUrl("href")
-			?: throw ParseException("Page image not found")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val doc = loaderContext.httpGet("https://${getDomain()}/search/?type=high", headers)
-			.parseHtml()
-		val root = doc.body().getElementById("search_form")
-		return root?.select("li.cate_list")?.mapNotNullToSet { li ->
-			val cateId = li.attr("cate_id") ?: return@mapNotNullToSet null
-			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
-			MangaTag(
-				title = a.text().toTitleCase(),
-				key = cateId,
-				source = source
-			)
-		} ?: parseFailed("Root not found")
-	}
-
-	private fun parseStatus(status: String) = when {
-		status.contains("Ongoing") -> MangaState.ONGOING
-		status.contains("Completed") -> MangaState.FINISHED
-		else -> null
-	}
-
-	private fun parseChapterDateByLang(date: String): Long {
-		val dateWords = date.split(" ")
-
-		if (dateWords.size == 3) {
-			if (dateWords[1].contains(",")) {
-				SimpleDateFormat("MMM d, yyyy", Locale.ENGLISH).tryParse(date)
-			} else {
-				val timeAgo = Integer.parseInt(dateWords[0])
-				return Calendar.getInstance().apply {
-					when (dateWords[1]) {
-						"minutes" -> Calendar.MINUTE // EN-FR
-						"hours" -> Calendar.HOUR // EN
-
-						"minutos" -> Calendar.MINUTE // ES
-						"horas" -> Calendar.HOUR
-
-						// "minutos" -> Calendar.MINUTE // BR
-						"hora" -> Calendar.HOUR
-
-						"минут" -> Calendar.MINUTE // RU
-						"часа" -> Calendar.HOUR
-
-						"Stunden" -> Calendar.HOUR // DE
-
-						"minuti" -> Calendar.MINUTE // IT
-						"ore" -> Calendar.HOUR
-
-						"heures" -> Calendar.HOUR // FR ("minutes" also French word)
-						else -> null
-					}?.let {
-						add(it, -timeAgo)
-					}
-				}.timeInMillis
-			}
-		}
-		return 0L
-	}
-
-	class English(loaderContext: MangaLoaderContext) : NineMangaRepository(
-		loaderContext,
-		MangaSource.NINEMANGA_EN,
-		"www.ninemanga.com",
-	)
-
-	class Spanish(loaderContext: MangaLoaderContext) : NineMangaRepository(
-		loaderContext,
-		MangaSource.NINEMANGA_ES,
-		"es.ninemanga.com",
-	)
-
-	class Russian(loaderContext: MangaLoaderContext) : NineMangaRepository(
-		loaderContext,
-		MangaSource.NINEMANGA_RU,
-		"ru.ninemanga.com",
-	)
-
-	class Deutsch(loaderContext: MangaLoaderContext) : NineMangaRepository(
-		loaderContext,
-		MangaSource.NINEMANGA_DE,
-		"de.ninemanga.com",
-	)
-
-	class Brazil(loaderContext: MangaLoaderContext) : NineMangaRepository(
-		loaderContext,
-		MangaSource.NINEMANGA_BR,
-		"br.ninemanga.com",
-	)
-
-	class Italiano(loaderContext: MangaLoaderContext) : NineMangaRepository(
-		loaderContext,
-		MangaSource.NINEMANGA_IT,
-		"it.ninemanga.com",
-	)
-
-	class Francais(loaderContext: MangaLoaderContext) : NineMangaRepository(
-		loaderContext,
-		MangaSource.NINEMANGA_FR,
-		"fr.ninemanga.com",
-	)
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NudeMoonRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NudeMoonRepository.kt
deleted file mode 100644
index 91dc0bf59..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NudeMoonRepository.kt
+++ /dev/null
@@ -1,225 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import android.util.SparseArray
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.regex.Pattern
-
-class NudeMoonRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext),
-	MangaRepositoryAuthProvider {
-
-	override val source = MangaSource.NUDEMOON
-	override val defaultDomain = "nude-moon.net"
-	override val authUrl: String
-		get() = "https://${getDomain()}/index.php"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.NEWEST,
-		SortOrder.POPULARITY,
-		SortOrder.RATING
-	)
-
-	private val pageUrlPatter = Pattern.compile(".*\\?page=[0-9]+$")
-
-	init {
-		loaderContext.cookieJar.insertCookies(
-			getDomain(),
-			"NMfYa=1;",
-			"nm_mobile=0;"
-		)
-	}
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
-	): List<Manga> {
-		val domain = getDomain()
-		val url = when {
-			!query.isNullOrEmpty() -> "https://$domain/search?stext=${query.urlEncoded()}&rowstart=$offset"
-			!tags.isNullOrEmpty() -> tags.joinToString(
-				separator = "_",
-				prefix = "https://$domain/tags/",
-				postfix = "&rowstart=$offset",
-				transform = { it.key.urlEncoded() }
-			)
-			else -> "https://$domain/all_manga?${getSortKey(sortOrder)}&rowstart=$offset"
-		}
-		val doc = loaderContext.httpGet(url).parseHtml()
-		val root = doc.body().run {
-			selectFirst("td.main-bg") ?: selectFirst("td.main-body")
-		} ?: parseFailed("Cannot find root")
-		return root.select("table.news_pic2").mapNotNull { row ->
-			val a = row.selectFirst("td.bg_style1")?.selectFirst("a")
-				?: return@mapNotNull null
-			val href = a.relUrl("href")
-			val title = a.selectFirst("h2")?.text().orEmpty()
-			val info = row.selectFirst("td[width=100%]") ?: return@mapNotNull null
-			Manga(
-				id = generateUid(href),
-				url = href,
-				title = title.substringAfter(" / "),
-				altTitle = title.substringBefore(" / ", "")
-					.takeUnless { it.isBlank() },
-				author = info.getElementsContainingOwnText("Автор:").firstOrNull()
-					?.nextElementSibling()?.ownText(),
-				coverUrl = row.selectFirst("img.news_pic2")?.absUrl("data-src")
-					.orEmpty(),
-				tags = row.selectFirst("span.tag-links")?.select("a")
-					?.mapToSet {
-						MangaTag(
-							title = it.text().toTitleCase(),
-							key = it.attr("href").substringAfterLast('/'),
-							source = source
-						)
-					}.orEmpty(),
-				source = source,
-				publicUrl = a.absUrl("href"),
-				rating = Manga.NO_RATING,
-				isNsfw = true,
-				description = row.selectFirst("div.description")?.html(),
-				state = null,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val body = loaderContext.httpGet(manga.url.withDomain()).parseHtml().body()
-		val root = body.selectFirst("table.shoutbox")
-			?: parseFailed("Cannot find root")
-		val info = root.select("div.tbl2")
-		val lastInfo = info.last()
-		return manga.copy(
-			largeCoverUrl = body.selectFirst("img.news_pic2")?.absUrl("src"),
-			description = info.select("div.blockquote").lastOrNull()?.html() ?: manga.description,
-			tags = info.select("span.tag-links").firstOrNull()?.select("a")?.mapToSet {
-				MangaTag(
-					title = it.text().toTitleCase(),
-					key = it.attr("href").substringAfterLast('/'),
-					source = source,
-				)
-			}?.plus(manga.tags) ?: manga.tags,
-			author = lastInfo?.getElementsByAttributeValueContaining("href", "mangaka/")?.text()
-				?: manga.author,
-			chapters = listOf(
-				MangaChapter(
-					id = manga.id,
-					url = manga.url,
-					source = source,
-					number = 1,
-					name = manga.title,
-					scanlator = lastInfo?.getElementsByAttributeValueContaining("href", "perevod/")?.text(),
-					uploadDate = lastInfo?.getElementsContainingOwnText("Дата:")
-						?.firstOrNull()
-						?.html()
-						?.parseDate() ?: 0L,
-					branch = null,
-				)
-			)
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.withDomain()
-		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		val root = doc.body().selectFirst("td.main-body")
-			?: parseFailed("Cannot find root")
-		val readlink = root.selectFirst("table.shoutbox")?.selectFirst("a")?.absUrl("href")
-			?: parseFailed("Cannot obtain read link")
-		val fullPages = getFullPages(readlink)
-		return root.getElementsByAttributeValueMatching("href", pageUrlPatter).mapIndexedNotNull { i, a ->
-			val url = a.relUrl("href")
-			MangaPage(
-				id = generateUid(url),
-				url = fullPages[i] ?: return@mapIndexedNotNull null,
-				referer = fullUrl,
-				preview = a.selectFirst("img")?.absUrl("src"),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val domain = getDomain()
-		val doc = loaderContext.httpGet("https://$domain/all_manga").parseHtml()
-		val root = doc.body().getElementsContainingOwnText("Поиск манги по тегам")
-			.firstOrNull()?.parents()?.find { it.tag().normalName() == "tbody" }
-			?.selectFirst("td.textbox")?.selectFirst("td.small")
-			?: parseFailed("Tags root not found")
-		return root.select("a").mapToSet {
-			MangaTag(
-				title = it.text().toTitleCase(),
-				key = it.attr("href").substringAfterLast('/')
-					.removeSuffix("+"),
-				source = source,
-			)
-		}
-	}
-
-	override fun isAuthorized(): Boolean {
-		return loaderContext.cookieJar.getCookies(getDomain()).any {
-			it.name == "fusion_user"
-		}
-	}
-
-	override suspend fun getUsername(): String {
-		val body = loaderContext.httpGet("https://${getDomain()}/").parseHtml()
-			.body()
-		return body
-			.getElementsContainingOwnText("Профиль")
-			.firstOrNull()
-			?.attr("href")
-			?.substringAfterLast('/')
-			?: run {
-				throw if (body.selectFirst("form[name=\"loginform\"]") != null) {
-					AuthRequiredException(source)
-				} else {
-					ParseException("Cannot find username")
-				}
-			}
-	}
-
-	private suspend fun getFullPages(url: String): SparseArray<String> {
-		val scripts = loaderContext.httpGet(url).parseHtml().select("script")
-		val regex = "images\\[(\\d+)].src = '([^']+)'".toRegex()
-		for (script in scripts) {
-			val src = script.html()
-			if (src.isEmpty()) {
-				continue
-			}
-			val matches = regex.findAll(src).toList()
-			if (matches.isEmpty()) {
-				continue
-			}
-			val result = SparseArray<String>(matches.size)
-			matches.forEach { match ->
-				val (index, link) = match.destructured
-				result.append(index.toInt(), link)
-			}
-			return result
-		}
-		parseFailed("Cannot find pages list")
-	}
-
-	private fun getSortKey(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
-			SortOrder.POPULARITY -> "views"
-			SortOrder.NEWEST -> "date"
-			SortOrder.RATING -> "like"
-			else -> "like"
-		}
-
-	private fun String.parseDate(): Long {
-		val dateString = substringBetweenFirst("Дата:", "<")?.trim() ?: return 0
-		val dateFormat = SimpleDateFormat("d MMMM yyyy", Locale("ru"))
-		return dateFormat.tryParse(dateString)
-	}
-}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ReadmangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ReadmangaRepository.kt
deleted file mode 100644
index ab95903d5..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ReadmangaRepository.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class ReadmangaRepository(loaderContext: MangaLoaderContext) : GroupleRepository(loaderContext) {
-
-	override val defaultDomain = "readmanga.io"
-	override val source = MangaSource.READMANGA_RU
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/RemangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/RemangaRepository.kt
deleted file mode 100644
index e98442148..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/RemangaRepository.kt
+++ /dev/null
@@ -1,258 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import okhttp3.Headers
-import org.json.JSONArray
-import org.json.JSONException
-import org.json.JSONObject
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.net.URLDecoder
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-
-private const val PAGE_SIZE = 30
-private const val STATUS_ONGOING = 1
-private const val STATUS_FINISHED = 0
-
-class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext),
-	MangaRepositoryAuthProvider {
-
-	override val source = MangaSource.REMANGA
-
-	override val defaultDomain = "remanga.org"
-	override val authUrl: String
-		get() = "https://${getDomain()}/user/login"
-
-	override val sortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.UPDATED,
-		SortOrder.POPULARITY,
-		SortOrder.RATING,
-		SortOrder.NEWEST
-	)
-
-	private val regexLastUrlPath = Regex("/[^/]+/?$")
-
-	override suspend fun getList2(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?,
-	): List<Manga> {
-		copyCookies()
-		val domain = getDomain()
-		val urlBuilder = StringBuilder()
-			.append("https://api.")
-			.append(domain)
-		if (query != null) {
-			urlBuilder.append("/api/search/?query=")
-				.append(query.urlEncoded())
-		} else {
-			urlBuilder.append("/api/search/catalog/?ordering=")
-				.append(getSortKey(sortOrder))
-			tags?.forEach { tag ->
-				urlBuilder.append("&genres=")
-				urlBuilder.append(tag.key)
-			}
-		}
-		urlBuilder
-			.append("&page=")
-			.append((offset / PAGE_SIZE) + 1)
-			.append("&count=")
-			.append(PAGE_SIZE)
-		val content = loaderContext.httpGet(urlBuilder.toString(), getApiHeaders()).parseJson()
-			.getJSONArray("content")
-		return content.map { jo ->
-			val url = "/manga/${jo.getString("dir")}"
-			val img = jo.getJSONObject("img")
-			Manga(
-				id = generateUid(url),
-				url = url,
-				publicUrl = "https://$domain$url",
-				title = jo.getString("rus_name"),
-				altTitle = jo.getString("en_name"),
-				rating = jo.getString("avg_rating").toFloatOrNull()?.div(10f) ?: Manga.NO_RATING,
-				coverUrl = "https://api.$domain${img.getString("mid")}",
-				largeCoverUrl = "https://api.$domain${img.getString("high")}",
-				author = null,
-				tags = jo.optJSONArray("genres")?.mapToSet { g ->
-					MangaTag(
-						title = g.getString("name").toTitleCase(),
-						key = g.getInt("id").toString(),
-						source = MangaSource.REMANGA
-					)
-				}.orEmpty(),
-				source = MangaSource.REMANGA
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		copyCookies()
-		val domain = getDomain()
-		val slug = manga.url.find(regexLastUrlPath)
-			?: throw ParseException("Cannot obtain slug from ${manga.url}")
-		val data = loaderContext.httpGet(
-			url = "https://api.$domain/api/titles/$slug/",
-			headers = getApiHeaders(),
-		).parseJson()
-		val content = try {
-			data.getJSONObject("content")
-		} catch (e: JSONException) {
-			throw ParseException(data.optString("msg"), e)
-		}
-		val branchId = content.getJSONArray("branches").optJSONObject(0)
-			?.getLong("id") ?: throw ParseException("No branches found")
-		val chapters = grabChapters(domain, branchId)
-		val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US)
-		return manga.copy(
-			description = content.getString("description"),
-			state = when (content.optJSONObject("status")?.getInt("id")) {
-				STATUS_ONGOING -> MangaState.ONGOING
-				STATUS_FINISHED -> MangaState.FINISHED
-				else -> null
-			},
-			tags = content.getJSONArray("genres").mapToSet { g ->
-				MangaTag(
-					title = g.getString("name").toTitleCase(),
-					key = g.getInt("id").toString(),
-					source = MangaSource.REMANGA
-				)
-			},
-			chapters = chapters.mapIndexed { i, jo ->
-				val id = jo.getLong("id")
-				val name = jo.getString("name").toTitleCase(Locale.ROOT)
-				val publishers = jo.optJSONArray("publishers")
-				MangaChapter(
-					id = generateUid(id),
-					url = "/api/titles/chapters/$id/",
-					number = chapters.size - i,
-					name = buildString {
-						append("Том ")
-						append(jo.optString("tome", "0"))
-						append(". ")
-						append("Глава ")
-						append(jo.optString("chapter", "0"))
-						if (name.isNotEmpty()) {
-							append(" - ")
-							append(name)
-						}
-					},
-					uploadDate = dateFormat.tryParse(jo.getString("upload_date")),
-					scanlator = publishers?.optJSONObject(0)?.getStringOrNull("name"),
-					source = MangaSource.REMANGA,
-					branch = null,
-				)
-			}.asReversed()
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val referer = "https://${getDomain()}/"
-		val content = loaderContext.httpGet(chapter.url.withDomain(subdomain = "api"), getApiHeaders()).parseJson()
-			.getJSONObject("content")
-		val pages = content.optJSONArray("pages")
-		if (pages == null) {
-			val pubDate = content.getStringOrNull("pub_date")?.let {
-				SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US).tryParse(it)
-			}
-			if (pubDate != null && pubDate > System.currentTimeMillis()) {
-				val at = SimpleDateFormat.getDateInstance(DateFormat.LONG).format(Date(pubDate))
-				parseFailed("Глава станет доступной $at")
-			} else {
-				parseFailed("Глава недоступна")
-			}
-		}
-		val result = ArrayList<MangaPage>(pages.length())
-		for (i in 0 until pages.length()) {
-			when (val item = pages.get(i)) {
-				is JSONObject -> result += parsePage(item, referer)
-				is JSONArray -> item.mapTo(result) { parsePage(it, referer) }
-				else -> throw ParseException("Unknown json item $item")
-			}
-		}
-		return result
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		val domain = getDomain()
-		val content = loaderContext.httpGet("https://api.$domain/api/forms/titles/?get=genres", getApiHeaders())
-			.parseJson().getJSONObject("content").getJSONArray("genres")
-		return content.mapToSet { jo ->
-			MangaTag(
-				title = jo.getString("name").toTitleCase(),
-				key = jo.getInt("id").toString(),
-				source = source
-			)
-		}
-	}
-
-	override fun isAuthorized(): Boolean {
-		return loaderContext.cookieJar.getCookies(getDomain()).any {
-			it.name == "user"
-		}
-	}
-
-	override suspend fun getUsername(): String {
-		val jo = loaderContext.httpGet(
-			url = "https://api.${getDomain()}/api/users/current/",
-			headers = getApiHeaders(),
-		).parseJson()
-		return jo.getJSONObject("content").getString("username")
-	}
-
-	private fun getApiHeaders(): Headers? {
-		val userCookie = loaderContext.cookieJar.getCookies(getDomain()).find {
-			it.name == "user"
-		} ?: return null
-		val jo = JSONObject(URLDecoder.decode(userCookie.value, Charsets.UTF_8.name()))
-		val accessToken = jo.getStringOrNull("access_token") ?: return null
-		return Headers.headersOf("authorization", "bearer $accessToken")
-	}
-
-	private fun copyCookies() {
-		val domain = getDomain()
-		loaderContext.cookieJar.copyCookies(domain, "api.$domain")
-	}
-
-	private fun getSortKey(order: SortOrder?) = when (order) {
-		SortOrder.UPDATED -> "-chapter_date"
-		SortOrder.POPULARITY -> "-rating"
-		SortOrder.RATING -> "-votes"
-		SortOrder.NEWEST -> "-id"
-		else -> "-chapter_date"
-	}
-
-	private fun parsePage(jo: JSONObject, referer: String) = MangaPage(
-		id = generateUid(jo.getLong("id")),
-		url = jo.getString("link"),
-		preview = null,
-		referer = referer,
-		source = source,
-	)
-
-	private suspend fun grabChapters(domain: String, branchId: Long): List<JSONObject> {
-		val result = ArrayList<JSONObject>(100)
-		var page = 1
-		while (true) {
-			val content = loaderContext.httpGet(
-				url = "https://api.$domain/api/titles/chapters/?branch_id=$branchId&page=$page&count=100",
-				headers = getApiHeaders(),
-			).parseJson().getJSONArray("content")
-			val len = content.length()
-			if (len == 0) {
-				break
-			}
-			result.ensureCapacity(result.size + len)
-			for (i in 0 until len) {
-				result.add(content.getJSONObject(i))
-			}
-			page++
-		}
-		return result
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/SelfMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/SelfMangaRepository.kt
deleted file mode 100644
index f83877f81..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/SelfMangaRepository.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class SelfMangaRepository(loaderContext: MangaLoaderContext) : GroupleRepository(loaderContext) {
-
-	override val defaultDomain = "selfmanga.live"
-	override val source = MangaSource.SELFMANGA
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/YaoiChanRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/YaoiChanRepository.kt
deleted file mode 100644
index 77edbb5b1..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/YaoiChanRepository.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.utils.ext.parseHtml
-import org.koitharu.kotatsu.utils.ext.relUrl
-
-class YaoiChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(loaderContext) {
-
-	override val source = MangaSource.YAOICHAN
-	override val defaultDomain = "yaoi-chan.me"
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
-		val root =
-			doc.body().getElementById("dle-content") ?: throw ParseException("Cannot find root")
-		return manga.copy(
-			description = root.getElementById("description")?.html()?.substringBeforeLast("<div"),
-			largeCoverUrl = root.getElementById("cover")?.absUrl("src"),
-			chapters = root.select("table.table_cha").flatMap { table ->
-				table.select("div.manga")
-			}.mapNotNull { it.selectFirst("a") }.reversed().mapIndexed { i, a ->
-				val href = a.relUrl("href")
-				MangaChapter(
-					id = generateUid(href),
-					name = a.text().trim(),
-					number = i + 1,
-					url = href,
-					uploadDate = 0L,
-					source = source,
-					scanlator = null,
-					branch = null,
-				)
-			}
-		)
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index c6dfdb5c6..971672a5d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -14,8 +14,8 @@ import com.google.android.material.color.DynamicColors
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.callbackFlow
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.model.ZoomMode
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.toUriOrNull
 import java.io.File
 import java.text.DateFormat
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
index 7a6036d06..36207275a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
@@ -1,30 +1,21 @@
 package org.koitharu.kotatsu.core.prefs
 
 import android.content.Context
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.parsers.MangaSourceConfig
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
-interface SourceSettings {
+class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig {
 
-	fun getDomain(defaultValue: String): String
+	private val prefs = context.getSharedPreferences(source.name, Context.MODE_PRIVATE)
 
-	fun isUseSsl(defaultValue: Boolean): Boolean
+	override fun getDomain(defaultValue: String) = prefs.getString(KEY_DOMAIN, defaultValue)
+		?.takeUnless(String::isBlank)
+		?: defaultValue
 
-	private class PrefSourceSettings(context: Context, source: MangaSource) : SourceSettings {
-
-		private val prefs = context.getSharedPreferences(source.name, Context.MODE_PRIVATE)
-
-		override fun getDomain(defaultValue: String) = prefs.getString(KEY_DOMAIN, defaultValue)
-			?.takeUnless(String::isBlank)
-			?: defaultValue
-
-		override fun isUseSsl(defaultValue: Boolean) = prefs.getBoolean(KEY_USE_SSL, defaultValue)
-	}
+	override fun isSslEnabled(defaultValue: Boolean) = prefs.getBoolean(KEY_USE_SSL, defaultValue)
 
 	companion object {
 
-		operator fun invoke(context: Context, source: MangaSource): SourceSettings =
-			PrefSourceSettings(context, source)
-
 		const val KEY_DOMAIN = "domain"
 		const val KEY_USE_SSL = "ssl"
 		const val KEY_AUTH = "auth"
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/ui/SortOrder.kt b/app/src/main/java/org/koitharu/kotatsu/core/ui/SortOrder.kt
new file mode 100644
index 000000000..92b9fd9ef
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/ui/SortOrder.kt
@@ -0,0 +1,15 @@
+package org.koitharu.kotatsu.core.ui
+
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.parsers.model.SortOrder
+
+@get:StringRes
+val SortOrder.titleRes: Int
+	get() = when (this) {
+		SortOrder.UPDATED -> R.string.updated
+		SortOrder.POPULARITY -> R.string.popular
+		SortOrder.RATING -> R.string.by_rating
+		SortOrder.NEWEST -> R.string.newest
+		SortOrder.ALPHABETICAL -> R.string.by_name
+	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
index 6ea44a8ac..e28a0613f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
@@ -15,13 +15,13 @@ import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.databinding.FragmentChaptersBinding
 import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersAdapter
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersSelectionDecoration
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
index d8cb87ecf..8c99b0ef5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
@@ -31,16 +31,16 @@ import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.browser.BrowserActivity
 import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.os.ShortcutsRepository
 import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
 import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity
 import org.koitharu.kotatsu.utils.ShareHelper
-import org.koitharu.kotatsu.utils.ext.buildAlertDialog
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 
 class DetailsActivity : BaseActivity<ActivityDetailsBinding>(),
@@ -246,7 +246,7 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(),
 				.show()
 			return
 		}
-		buildAlertDialog(this) {
+		MaterialAlertDialogBuilder(this).apply {
 			setMessage(R.string.chapter_is_missing_text)
 			setTitle(R.string.chapter_is_missing)
 			setNegativeButton(android.R.string.cancel, null)
@@ -272,7 +272,7 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(),
 
 		fun newIntent(context: Context, manga: Manga): Intent {
 			return Intent(context, DetailsActivity::class.java)
-				.putExtra(MangaIntent.KEY_MANGA, manga)
+				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
 		}
 
 		fun newIntent(context: Context, mangaId: Long): Intent {
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
index 35d3b2e17..b9ad24e1c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
@@ -23,10 +23,14 @@ import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
-import org.koitharu.kotatsu.core.model.*
+import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
 import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesDialog
 import org.koitharu.kotatsu.image.ui.ImageActivity
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaState
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.search.ui.MangaListActivity
@@ -86,14 +90,15 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
 			}
 
 			// Info containers
-			if (manga.chapters.isNullOrEmpty()) {
+			val chapters = manga.chapters
+			if (chapters.isNullOrEmpty()) {
 				infoLayout.textViewChapters.isVisible = false
 			} else {
 				infoLayout.textViewChapters.isVisible = true
 				infoLayout.textViewChapters.text = resources.getQuantityString(
 					R.plurals.chapters,
-					manga.chapters.size,
-					manga.chapters.size,
+					chapters.size,
+					chapters.size,
 				)
 			}
 			if (manga.rating == Manga.NO_RATING) {
@@ -233,7 +238,7 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
 
 	override fun onChipClick(chip: Chip, data: Any?) {
 		val tag = data as? MangaTag ?: return
-		startActivity(MangaListActivity.newIntent(requireContext(), tag))
+		startActivity(MangaListActivity.newIntent(requireContext(), setOf(tag)))
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
index 2f660e5b4..a9a758ea6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
@@ -11,9 +11,6 @@ import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.exceptions.MangaNotFoundException
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
@@ -21,11 +18,14 @@ import org.koitharu.kotatsu.details.ui.model.toListItem
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.iterator
 import org.koitharu.kotatsu.utils.ext.mapToSet
-import org.koitharu.kotatsu.utils.ext.toTitleCase
 import java.io.IOException
 
 class DetailsViewModel(
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
index 2e1ac64bd..6f37c8e53 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
@@ -1,6 +1,6 @@
 package org.koitharu.kotatsu.details.ui.model
 
-import org.koitharu.kotatsu.core.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaChapter
 
 class ChapterListItem(
 	val chapter: MangaChapter,
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt
index 98a7f9c4b..22d272346 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt
@@ -1,11 +1,11 @@
 package org.koitharu.kotatsu.details.ui.model
 
-import org.koitharu.kotatsu.core.model.MangaChapter
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_CURRENT
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_DOWNLOADED
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_MISSING
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_NEW
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_UNREAD
+import org.koitharu.kotatsu.parsers.model.MangaChapter
 import java.text.DateFormat
 
 fun MangaChapter.toListItem(
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
index b4de213d5..a56ad85c5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
@@ -15,13 +15,13 @@ import okhttp3.Request
 import okio.IOException
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.local.data.MangaZip
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.utils.ext.await
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.utils.ext.deleteAwait
 import org.koitharu.kotatsu.utils.ext.referer
 import org.koitharu.kotatsu.utils.ext.waitForNetwork
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
index 46054d901..03352d7be 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
@@ -11,10 +11,10 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.domain.DownloadManager
 import org.koitharu.kotatsu.download.ui.DownloadsActivity
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.PendingIntentCompat
 import org.koitharu.kotatsu.utils.ext.format
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
index 5d62833fc..64b6a2529 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
@@ -27,9 +27,10 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseService
 import org.koitharu.kotatsu.base.ui.dialog.CheckBoxAlertDialog
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.connectivityManager
 import org.koitharu.kotatsu.utils.ext.toArraySet
 import org.koitharu.kotatsu.utils.progress.ProgressJob
@@ -60,7 +61,7 @@ class DownloadService : BaseService() {
 
 	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
 		super.onStartCommand(intent, flags, startId)
-		val manga = intent?.getParcelableExtra<Manga>(EXTRA_MANGA)
+		val manga = intent?.getParcelableExtra<ParcelableManga>(EXTRA_MANGA)?.manga
 		val chapters = intent?.getLongArrayExtra(EXTRA_CHAPTERS_IDS)?.toArraySet()
 		return if (manga != null) {
 			jobs[startId] = downloadManga(startId, manga, chapters)
@@ -112,7 +113,7 @@ class DownloadService : BaseService() {
 					if (stateFlow.value is DownloadManager.State.Done) {
 						sendBroadcast(
 							Intent(ACTION_DOWNLOAD_COMPLETE)
-								.putExtra(EXTRA_MANGA, manga)
+								.putExtra(EXTRA_MANGA, ParcelableManga(manga))
 						)
 					}
 				} finally {
@@ -171,7 +172,7 @@ class DownloadService : BaseService() {
 			}
 			confirmDataTransfer(context) {
 				val intent = Intent(context, DownloadService::class.java)
-				intent.putExtra(EXTRA_MANGA, manga)
+				intent.putExtra(EXTRA_MANGA, ParcelableManga(manga))
 				if (chaptersIds != null) {
 					intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
 				}
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
index aa054c441..b7a81e840 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
@@ -4,7 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.util.*
 
 @Entity(tableName = "favourite_categories")
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
index cf7d0f8f9..9e5da45f7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
@@ -5,7 +5,7 @@ import androidx.sqlite.db.SimpleSQLiteQuery
 import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder
 
 @Dao
 abstract class FavouritesDao {
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
index 48d6a34aa..868e2495c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
@@ -9,10 +9,10 @@ import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.mapItems
 import org.koitharu.kotatsu.utils.ext.mapToSet
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
index edc8c8519..7c05d26dd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
@@ -12,12 +12,13 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.core.ui.titleRes
 import org.koitharu.kotatsu.databinding.FragmentFavouritesBinding
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
 import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
 import org.koitharu.kotatsu.main.ui.AppBarOwner
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.RecycledViewPoolHolder
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.measureHeight
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
index 8a1076d37..15c579bf0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
@@ -19,8 +19,9 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.core.ui.titleRes
 import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.measureHeight
 import org.koitharu.kotatsu.utils.ext.showPopupMenu
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
index a9202d749..c87e44c76 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
@@ -4,8 +4,8 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import java.util.*
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
index c1496aa4c..a7918e362 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
@@ -13,11 +13,12 @@ import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.ui.BaseBottomSheet
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.databinding.DialogFavoriteCategoriesBinding
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
 import org.koitharu.kotatsu.favourites.ui.categories.select.adapter.MangaCategoriesAdapter
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.withArgs
 
@@ -26,7 +27,7 @@ class FavouriteCategoriesDialog : BaseBottomSheet<DialogFavoriteCategoriesBindin
 	View.OnClickListener {
 
 	private val viewModel by viewModel<MangaCategoriesViewModel> {
-		parametersOf(requireNotNull(arguments?.getParcelable<Manga>(MangaIntent.KEY_MANGA)))
+		parametersOf(requireNotNull(arguments?.getParcelable<ParcelableManga>(MangaIntent.KEY_MANGA)).manga)
 	}
 
 	private var adapter: MangaCategoriesAdapter? = null
@@ -86,7 +87,7 @@ class FavouriteCategoriesDialog : BaseBottomSheet<DialogFavoriteCategoriesBindin
 
 		fun show(fm: FragmentManager, manga: Manga) = FavouriteCategoriesDialog()
 			.withArgs(1) {
-				putParcelable(MangaIntent.KEY_MANGA, manga)
+				putParcelable(MangaIntent.KEY_MANGA, ParcelableManga(manga))
 			}.show(fm, TAG)
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt
index 3b900f34c..511ad6b0b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt
@@ -4,9 +4,9 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.combine
 import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 
 class MangaCategoriesViewModel(
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
index a78674817..949d13659 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
@@ -6,8 +6,8 @@ import android.view.MenuItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.list.ui.MangaListFragment
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.withArgs
 
 class FavouritesListFragment : MangaListFragment() {
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt
index 0cd5301a9..34a848730 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt
@@ -5,8 +5,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.list.domain.CountersProvider
@@ -15,6 +13,8 @@ import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.list.ui.model.toErrorState
 import org.koitharu.kotatsu.list.ui.model.toUi
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/domain/HistoryRepository.kt b/app/src/main/java/org/koitharu/kotatsu/history/domain/HistoryRepository.kt
index c492e0e0b..4235765fd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/domain/HistoryRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/domain/HistoryRepository.kt
@@ -6,11 +6,11 @@ import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaHistory
-import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.ext.mapItems
 import org.koitharu.kotatsu.utils.ext.mapToSet
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/domain/MangaWithHistory.kt b/app/src/main/java/org/koitharu/kotatsu/history/domain/MangaWithHistory.kt
index 8b657599d..611dd1ded 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/domain/MangaWithHistory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/domain/MangaWithHistory.kt
@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.history.domain
 
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaHistory
+import org.koitharu.kotatsu.parsers.model.Manga
 
 data class MangaWithHistory(
 	val manga: Manga,
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt
index 8b5aaa9ec..3e2772c62 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt
@@ -9,9 +9,9 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.list.ui.MangaListFragment
-import org.koitharu.kotatsu.utils.ext.ellipsize
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.ellipsize
 
 class HistoryListFragment : MangaListFragment() {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
index b37e01a3c..f52241708 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
@@ -5,7 +5,6 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.os.ShortcutsRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
@@ -14,6 +13,7 @@ import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.history.domain.MangaWithHistory
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 import org.koitharu.kotatsu.list.ui.model.*
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/domain/AvailableFilters.kt b/app/src/main/java/org/koitharu/kotatsu/list/domain/AvailableFilters.kt
deleted file mode 100644
index 414a219db..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/list/domain/AvailableFilters.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.koitharu.kotatsu.list.domain
-
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.core.model.SortOrder
-
-class AvailableFilters(
-	val sortOrders: Set<SortOrder>,
-	val tags: Set<MangaTag>,
-) {
-
-	val size: Int
-		get() = sortOrders.size + tags.size
-
-	override fun equals(other: Any?): Boolean {
-		if (this === other) return true
-		if (javaClass != other?.javaClass) return false
-		other as AvailableFilters
-		if (sortOrders != other.sortOrders) return false
-		if (tags != other.tags) return false
-		return true
-	}
-
-	override fun hashCode(): Int {
-		var result = sortOrders.hashCode()
-		result = 31 * result + tags.hashCode()
-		return result
-	}
-
-	fun isEmpty(): Boolean = sortOrders.isEmpty() && tags.isEmpty()
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
index 70b2d8c93..77c4cbb5d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
@@ -20,9 +20,7 @@ import org.koitharu.kotatsu.base.ui.list.PaginationScrollListener
 import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
 import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
@@ -31,6 +29,8 @@ import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.main.ui.AppBarOwner
 import org.koitharu.kotatsu.main.ui.MainActivity
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.utils.RecycledViewPoolHolder
 import org.koitharu.kotatsu.utils.ext.*
 
@@ -152,7 +152,7 @@ abstract class MangaListFragment : BaseFragment<FragmentListBinding>(),
 	}
 
 	private fun resolveException(e: Throwable) {
-		if (e is ResolvableException) {
+		if (ExceptionResolver.canResolve(e)) {
 			viewLifecycleScope.launch {
 				if (exceptionResolver.resolve(e)) {
 					viewModel.onRetry()
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt
index 6a04449b6..6ad0f2533 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt
@@ -6,10 +6,10 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 
 abstract class MangaListViewModel(
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/CurrentFilterAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/CurrentFilterAD.kt
index 5508f9f9c..86b72c738 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/CurrentFilterAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/CurrentFilterAD.kt
@@ -3,9 +3,9 @@ package org.koitharu.kotatsu.list.ui.adapter
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
-import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.list.ui.model.CurrentFilterModel
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.MangaTag
 
 fun currentFilterAD(
 	listener: MangaListListener,
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
index df322b010..ec44f2ab9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
@@ -4,6 +4,7 @@ import android.widget.TextView
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.titleRes
 import org.koitharu.kotatsu.databinding.ItemHeaderWithFilterBinding
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
index 002281c70..97d451ddd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
@@ -8,10 +8,10 @@ import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.databinding.ItemMangaGridBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaGridModel
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
 import org.koitharu.kotatsu.utils.ext.referer
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
index 042540184..8803e37e6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
@@ -8,10 +8,10 @@ import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.databinding.ItemMangaListDetailsBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaListDetailedModel
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
 import org.koitharu.kotatsu.utils.ext.referer
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
index 0a17d4bc5..2df6bb7ca 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
@@ -8,10 +8,10 @@ import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.databinding.ItemMangaListBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaListModel
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
 import org.koitharu.kotatsu.utils.ext.referer
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListListener.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListListener.kt
index 5b372f2f8..d9cc8d8e4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListListener.kt
@@ -1,8 +1,8 @@
 package org.koitharu.kotatsu.list.ui.adapter
 
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaTag
 
 interface MangaListListener : OnListItemClickListener<Manga> {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapterDelegates.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapterDelegates.kt
index 8898c5d07..29216ac59 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapterDelegates.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapterDelegates.kt
@@ -5,6 +5,7 @@ import androidx.core.view.isVisible
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.titleRes
 import org.koitharu.kotatsu.databinding.ItemCheckableMultipleBinding
 import org.koitharu.kotatsu.databinding.ItemCheckableSingleBinding
 import org.koitharu.kotatsu.databinding.ItemFilterHeaderBinding
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt
index bbcd57ad5..fc3087f12 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt
@@ -9,8 +9,8 @@ import kotlinx.coroutines.flow.*
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import java.util.*
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterItem.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterItem.kt
index c9819304d..bbef939cb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterItem.kt
@@ -1,8 +1,8 @@
 package org.koitharu.kotatsu.list.ui.filter
 
 import androidx.annotation.StringRes
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
 
 sealed interface FilterItem {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterState.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterState.kt
index fdb42a261..d9e387b89 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterState.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterState.kt
@@ -1,15 +1,12 @@
 package org.koitharu.kotatsu.list.ui.filter
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
 
-@Parcelize
 class FilterState(
 	val sortOrder: SortOrder?,
 	val tags: Set<MangaTag>,
-) : Parcelable {
+) {
 
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListHeader.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
index a14db0f3a..94f13444c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.list.ui.model
 
 import androidx.annotation.StringRes
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder
 
 data class ListHeader(
 	val text: CharSequence?,
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
index 749e38369..fe4ff3baa 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
@@ -1,12 +1,13 @@
 package org.koitharu.kotatsu.list.ui.model
 
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.list.domain.CountersProvider
+import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.ifZero
 
 fun Manga.toListModel(counter: Int) = MangaListModel(
 	id = id,
@@ -76,7 +77,7 @@ fun Throwable.toErrorState(canRetry: Boolean = true) = ErrorState(
 	exception = this,
 	icon = getErrorIcon(this),
 	canRetry = canRetry,
-	buttonText = (this as? ResolvableException)?.resolveTextId ?: R.string.try_again
+	buttonText = ExceptionResolver.getResolveStringId(this).ifZero { R.string.try_again }
 )
 
 fun Throwable.toErrorFooter() = ErrorFooter(
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaGridModel.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaGridModel.kt
index 3ba8b6b37..159316c28 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaGridModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaGridModel.kt
@@ -1,6 +1,6 @@
 package org.koitharu.kotatsu.list.ui.model
 
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
 
 data class MangaGridModel(
 	val id: Long,
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListDetailedModel.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListDetailedModel.kt
index 73735224c..46df8f7bb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListDetailedModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListDetailedModel.kt
@@ -1,6 +1,6 @@
 package org.koitharu.kotatsu.list.ui.model
 
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
 
 data class MangaListDetailedModel(
 	val id: Long,
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListModel.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListModel.kt
index 603f6b197..7f9c9fd90 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListModel.kt
@@ -1,6 +1,6 @@
 package org.koitharu.kotatsu.list.ui.model
 
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
 
 data class MangaListModel(
 	val id: Long,
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt b/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
index 9b5b87822..c44e33aef 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
@@ -4,11 +4,11 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.local.ui.LocalListViewModel
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 val localModule
 	get() = module {
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
index 791e9985a..4cbf8b8c3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
@@ -3,11 +3,15 @@ package org.koitharu.kotatsu.local.data
 import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.utils.ext.*
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
+import org.koitharu.kotatsu.parsers.util.json.mapJSONToSet
+import org.koitharu.kotatsu.parsers.util.toTitleCase
 
 class MangaIndex(source: String?) {
 
@@ -56,7 +60,7 @@ class MangaIndex(source: String?) {
 			isNsfw = json.getBooleanOrDefault("nsfw", false),
 			coverUrl = json.getString("cover"),
 			description = json.getStringOrNull("description"),
-			tags = json.getJSONArray("tags").mapToSet { x ->
+			tags = json.getJSONArray("tags").mapJSONToSet { x ->
 				MangaTag(
 					title = x.getString("title").toTitleCase(),
 					key = x.getString("key"),
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaZip.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaZip.kt
index 533c619a8..0aacb4ee7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaZip.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaZip.kt
@@ -2,10 +2,10 @@ package org.koitharu.kotatsu.local.data
 
 import androidx.annotation.CheckResult
 import androidx.annotation.WorkerThread
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.util.toFileNameSafe
 import org.koitharu.kotatsu.utils.ext.takeIfReadable
-import org.koitharu.kotatsu.utils.ext.toFileNameSafe
 import java.io.File
 
 @WorkerThread
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
index dd0782493..bf0da97f9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
@@ -3,8 +3,8 @@ package org.koitharu.kotatsu.local.data
 import android.content.Context
 import com.tomclaw.cache.DiskLruCache
 import kotlinx.coroutines.flow.MutableStateFlow
+import org.koitharu.kotatsu.parsers.util.longHashCode
 import org.koitharu.kotatsu.utils.FileSize
-import org.koitharu.kotatsu.utils.ext.longHashCode
 import org.koitharu.kotatsu.utils.ext.subdir
 import org.koitharu.kotatsu.utils.ext.takeIfReadable
 import java.io.File
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
index 04adc71f8..179c71e2b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
@@ -10,12 +10,14 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
-import org.koitharu.kotatsu.core.model.*
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.local.data.CbzFilter
 import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.local.data.MangaIndex
 import org.koitharu.kotatsu.local.data.MangaZip
+import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.util.longHashCode
+import org.koitharu.kotatsu.parsers.util.toCamelCase
 import org.koitharu.kotatsu.utils.AlphanumComparator
 import org.koitharu.kotatsu.utils.ext.*
 import java.io.File
@@ -29,7 +31,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 	override val source = MangaSource.LOCAL
 	private val filenameFilter = CbzFilter()
 
-	override suspend fun getList2(
+	override suspend fun getList(
 		offset: Int,
 		query: String?,
 		tags: Set<MangaTag>?,
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt
index 35c8e8986..0bb8d1588 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt
@@ -14,10 +14,10 @@ import com.google.android.material.snackbar.Snackbar
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.list.ui.MangaListFragment
-import org.koitharu.kotatsu.utils.ext.ellipsize
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.ellipsize
 import org.koitharu.kotatsu.utils.progress.Progress
 
 class LocalListFragment : MangaListFragment(), ActivityResultCallback<List<@JvmSuppressWildcards Uri>> {
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
index 1050475c2..a828d0ed5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
@@ -9,13 +9,13 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.os.ShortcutsRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 import org.koitharu.kotatsu.list.ui.model.*
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.progress.Progress
@@ -105,7 +105,7 @@ class LocalListViewModel(
 	private suspend fun doRefresh() {
 		try {
 			listError.value = null
-			mangaList.value = repository.getList2(0)
+			mangaList.value = repository.getList(0)
 		} catch (e: Throwable) {
 			listError.value = e
 		}
diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
index 3d9332627..d1ba95fb9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -29,9 +29,6 @@ import org.koin.android.ext.android.get
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.core.prefs.AppSection
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.ActivityMainBinding
@@ -40,6 +37,9 @@ import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.favourites.ui.FavouritesContainerFragment
 import org.koitharu.kotatsu.history.ui.HistoryListFragment
 import org.koitharu.kotatsu.local.ui.LocalListFragment
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
 import org.koitharu.kotatsu.search.ui.MangaListActivity
@@ -261,9 +261,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 	}
 
 	override fun onTagClick(tag: MangaTag) {
-		startActivity(
-			MangaListActivity.newIntent(this, tag)
-		)
+		startActivity(MangaListActivity.newIntent(this, setOf(tag)))
 	}
 
 	override fun onQueryChanged(query: String) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainViewModel.kt
index f197e454c..a3fe2b263 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainViewModel.kt
@@ -7,9 +7,9 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onStart
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/protect/ProtectViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/protect/ProtectViewModel.kt
index 8574599c1..07646482b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/protect/ProtectViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/protect/ProtectViewModel.kt
@@ -5,8 +5,8 @@ import kotlinx.coroutines.delay
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.exceptions.WrongPasswordException
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.parsers.util.md5
 import org.koitharu.kotatsu.utils.SingleLiveEvent
-import org.koitharu.kotatsu.utils.ext.md5
 
 private const val PASSWORD_COMPARE_DELAY = 1_000L
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt b/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt
index fc87ba5d6..11061c348 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt
@@ -16,17 +16,16 @@ import okhttp3.Request
 import okio.Closeable
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
-import org.koitharu.kotatsu.core.model.MangaPage
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
-import org.koitharu.kotatsu.utils.ext.await
 import org.koitharu.kotatsu.utils.ext.connectivityManager
-import org.koitharu.kotatsu.utils.ext.mangaRepositoryOf
 import org.koitharu.kotatsu.utils.progress.ProgressDeferred
 import java.io.File
 import java.util.*
@@ -142,7 +141,7 @@ class PageLoader : KoinComponent, Closeable {
 		return if (result != null && result.source == source) {
 			result
 		} else {
-			mangaRepositoryOf(source).also { repository = it }
+			MangaRepository(source).also { repository = it }
 		}
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ChaptersBottomSheet.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ChaptersBottomSheet.kt
index 3b079255a..7132711f1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ChaptersBottomSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ChaptersBottomSheet.kt
@@ -12,12 +12,13 @@ import org.koin.android.ext.android.get
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseBottomSheet
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.MangaChapter
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaChapters
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.SheetChaptersBinding
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersAdapter
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.toListItem
+import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.utils.BottomSheetToolbarController
 import org.koitharu.kotatsu.utils.ext.withArgs
 
@@ -37,7 +38,7 @@ class ChaptersBottomSheet : BaseBottomSheet<SheetChaptersBinding>(), OnListItemC
 		binding.recyclerView.addItemDecoration(
 			MaterialDividerItemDecoration(view.context, RecyclerView.VERTICAL)
 		)
-		val chapters = arguments?.getParcelableArrayList<MangaChapter>(ARG_CHAPTERS)
+		val chapters = arguments?.getParcelable<ParcelableMangaChapters>(ARG_CHAPTERS)?.chapters
 		if (chapters.isNullOrEmpty()) {
 			dismissAllowingStateLoss()
 			return
@@ -96,7 +97,7 @@ class ChaptersBottomSheet : BaseBottomSheet<SheetChaptersBinding>(), OnListItemC
 			chapters: List<MangaChapter>,
 			currentId: Long,
 		) = ChaptersBottomSheet().withArgs(2) {
-			putParcelableArrayList(ARG_CHAPTERS, chapters.asArrayList())
+			putParcelable(ARG_CHAPTERS, ParcelableMangaChapters(chapters))
 			putLong(ARG_CURRENT_ID, currentId)
 		}.show(fm, TAG)
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
index cd15c2bfa..8f93d4449 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
@@ -36,12 +36,13 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.ui.BaseFullscreenActivity
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
-import org.koitharu.kotatsu.core.model.MangaPage
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.databinding.ActivityReaderBinding
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.ui.pager.BaseReader
 import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState
 import org.koitharu.kotatsu.reader.ui.pager.reversed.ReversedReaderFragment
@@ -224,8 +225,9 @@ class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
 			.setMessage(e.getDisplayMessage(resources))
 			.setNegativeButton(R.string.close, listener)
 			.setOnCancelListener(listener)
-		if (e is ResolvableException) {
-			dialog.setPositiveButton(e.resolveTextId, listener)
+		val resolveTextId = ExceptionResolver.getResolveStringId(e)
+		if (resolveTextId != 0) {
+			dialog.setPositiveButton(resolveTextId, listener)
 		}
 		dialog.show()
 	}
@@ -376,7 +378,7 @@ class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
 	) : DialogInterface.OnClickListener, DialogInterface.OnCancelListener {
 
 		override fun onClick(dialog: DialogInterface?, which: Int) {
-			if (which == DialogInterface.BUTTON_POSITIVE && exception is ResolvableException) {
+			if (which == DialogInterface.BUTTON_POSITIVE) {
 				dialog?.dismiss()
 				tryResolve(exception)
 			} else {
@@ -390,7 +392,7 @@ class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
 			}
 		}
 
-		private fun tryResolve(e: ResolvableException) {
+		private fun tryResolve(e: Throwable) {
 			lifecycleScope.launch {
 				if (exceptionResolver.resolve(e)) {
 					viewModel.reload()
@@ -409,7 +411,7 @@ class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
 
 		fun newIntent(context: Context, manga: Manga, state: ReaderState?): Intent {
 			return Intent(context, ReaderActivity::class.java)
-				.putExtra(MangaIntent.KEY_MANGA, manga)
+				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
 				.putExtra(EXTRA_STATE, state)
 		}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderState.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderState.kt
index daf63e3ff..530883a7a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderState.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderState.kt
@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.reader.ui
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaHistory
+import org.koitharu.kotatsu.parsers.model.Manga
 
 @Parcelize
 data class ReaderState(
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
index bae04af94..8271d1e3e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
@@ -13,15 +13,15 @@ import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.domain.MangaUtils
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.exceptions.MangaNotFoundException
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
-import org.koitharu.kotatsu.core.model.MangaPage
 import org.koitharu.kotatsu.core.os.ShortcutsRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy
 import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt
index c32605b96..bf4965934 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt
@@ -12,8 +12,8 @@ import androidx.fragment.app.commit
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.databinding.ActivitySettingsSimpleBinding
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.settings.*
 
 class SimpleSettingsActivity : BaseActivity<ActivitySettingsSimpleBinding>() {
@@ -30,7 +30,7 @@ class SimpleSettingsActivity : BaseActivity<ActivitySettingsSimpleBinding>() {
 					ACTION_READER -> ReaderSettingsFragment()
 					ACTION_SUGGESTIONS -> SuggestionsSettingsFragment()
 					ACTION_SOURCE -> SourceSettingsFragment.newInstance(
-						intent.getParcelableExtra(EXTRA_SOURCE) ?: MangaSource.LOCAL
+						intent.getSerializableExtra(EXTRA_SOURCE) as? MangaSource ?: MangaSource.LOCAL
 					)
 					else -> MainSettingsFragment()
 				}
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt
index 041bc38da..9ce52f4fe 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt
@@ -9,10 +9,9 @@ import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
-import org.koitharu.kotatsu.core.model.MangaPage
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import java.io.File
 import java.io.IOException
@@ -42,8 +41,9 @@ class PageHolderDelegate(
 		val prevJob = job
 		job = scope.launch {
 			prevJob?.cancelAndJoin()
-			(error as? ResolvableException)?.let {
-				exceptionResolver.resolve(it)
+			val e = error
+			if (e != null && ExceptionResolver.canResolve(e)) {
+				exceptionResolver.resolve(e)
 			}
 			doLoad(page, force = true)
 		}
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/ReaderPage.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/ReaderPage.kt
index 7ff4106cb..bc3f3220e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/ReaderPage.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/ReaderPage.kt
@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.reader.ui.pager
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
-import org.koitharu.kotatsu.core.model.MangaPage
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 @Parcelize
 data class ReaderPage(
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt
index ff1828c00..55e76b41a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt
@@ -8,7 +8,6 @@ import com.davemorrissey.labs.subscaleview.ImageSource
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.ItemPageBinding
@@ -16,6 +15,7 @@ import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.pager.BasePageHolder
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.ifZero
 
 open class PageHolder(
 	binding: ItemPageBinding,
@@ -109,7 +109,7 @@ open class PageHolder(
 	override fun onError(e: Throwable) {
 		binding.textViewError.text = e.getDisplayMessage(context.resources)
 		binding.buttonRetry.setText(
-			(e as? ResolvableException)?.resolveTextId ?: R.string.try_again
+			ExceptionResolver.getResolveStringId(e).ifZero { R.string.try_again }
 		)
 		binding.layoutError.isVisible = true
 		binding.progressBar.isVisible = false
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt
index 35c2c396c..be9e06181 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt
@@ -7,7 +7,6 @@ import com.davemorrissey.labs.subscaleview.ImageSource
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.ItemPageWebtoonBinding
@@ -15,6 +14,7 @@ import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.pager.BasePageHolder
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.ifZero
 
 
 class WebtoonHolder(
@@ -89,7 +89,7 @@ class WebtoonHolder(
 	override fun onError(e: Throwable) {
 		binding.textViewError.text = e.getDisplayMessage(context.resources)
 		binding.buttonRetry.setText(
-			(e as? ResolvableException)?.resolveTextId ?: R.string.try_again
+			ExceptionResolver.getResolveStringId(e).ifZero { R.string.try_again }
 		)
 		binding.layoutError.isVisible = true
 		binding.progressBar.isVisible = false
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt
index 25e808e3b..31396bd06 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.graphics.PointF
 import android.util.AttributeSet
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-import org.koitharu.kotatsu.utils.ext.toIntUp
+import org.koitharu.kotatsu.parsers.util.toIntUp
 
 private const val SCROLL_UNKNOWN = -1
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/OnPageSelectListener.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/OnPageSelectListener.kt
index 57eb3645c..38db30b5e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/OnPageSelectListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/OnPageSelectListener.kt
@@ -1,6 +1,6 @@
 package org.koitharu.kotatsu.reader.ui.thumbnails
 
-import org.koitharu.kotatsu.core.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaPage
 
 fun interface OnPageSelectListener {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PageThumbnail.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PageThumbnail.kt
index 18717e027..22c5ddad5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PageThumbnail.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PageThumbnail.kt
@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.reader.ui.thumbnails
 
-import org.koitharu.kotatsu.core.model.MangaPage
 import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.parsers.model.MangaPage
 
 data class PageThumbnail(
 	val number: Int,
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
index 314b281dc..7fbf8f9da 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
@@ -13,13 +13,14 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseBottomSheet
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.core.model.MangaPage
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaPages
+import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.SheetPagesBinding
 import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
+import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.ui.thumbnails.adapter.PageThumbnailAdapter
 import org.koitharu.kotatsu.utils.BottomSheetToolbarController
-import org.koitharu.kotatsu.utils.ext.mangaRepositoryOf
 import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 import org.koitharu.kotatsu.utils.ext.withArgs
 
@@ -31,13 +32,13 @@ class PagesThumbnailsSheet : BaseBottomSheet<SheetPagesBinding>(),
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		val pages = arguments?.getParcelableArrayList<MangaPage>(ARG_PAGES)
+		val pages = arguments?.getParcelable<ParcelableMangaPages>(ARG_PAGES)?.pages
 		if (pages.isNullOrEmpty()) {
 			dismissAllowingStateLoss()
 			return
 		}
 		val current = arguments?.getInt(ARG_CURRENT, -1) ?: -1
-		val repository = mangaRepositoryOf(pages.first().source)
+		val repository = MangaRepository(pages.first().source)
 		thumbnails = pages.mapIndexed { i, x ->
 			PageThumbnail(
 				number = i + 1,
@@ -127,7 +128,7 @@ class PagesThumbnailsSheet : BaseBottomSheet<SheetPagesBinding>(),
 
 		fun show(fm: FragmentManager, pages: List<MangaPage>, title: String, currentPage: Int) =
 			PagesThumbnailsSheet().withArgs(3) {
-				putParcelableArrayList(ARG_PAGES, ArrayList<MangaPage>(pages))
+				putParcelable(ARG_PAGES, ParcelableMangaPages(pages))
 				putString(ARG_TITLE, title)
 				putInt(ARG_CURRENT, currentPage)
 			}.show(fm, TAG)
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt
index 2ae446b4f..372655317 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt
@@ -8,9 +8,9 @@ import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import kotlinx.coroutines.*
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.MangaPage
 import org.koitharu.kotatsu.databinding.ItemPageThumbBinding
 import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
 import org.koitharu.kotatsu.utils.ext.IgnoreErrors
 import org.koitharu.kotatsu.utils.ext.referer
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt
index 5ca6b367b..0d8161670 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt
@@ -4,8 +4,8 @@ import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter
 import kotlinx.coroutines.CoroutineScope
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.MangaPage
 import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
 
 class PageThumbnailAdapter(
diff --git a/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt b/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt
index befa7151c..bcb2bed8c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt
@@ -3,9 +3,9 @@ package org.koitharu.kotatsu.remotelist
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.remotelist.ui.RemoteListViewModel
 
 val remoteListModule
diff --git a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt
index ef918db8e..2df3aa5db 100644
--- a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt
@@ -6,11 +6,11 @@ import android.view.MenuItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.list.ui.MangaListFragment
 import org.koitharu.kotatsu.list.ui.filter.FilterBottomSheet
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.reader.ui.SimpleSettingsActivity
-import org.koitharu.kotatsu.utils.ext.parcelableArgument
+import org.koitharu.kotatsu.utils.ext.serializableArgument
 import org.koitharu.kotatsu.utils.ext.withArgs
 
 class RemoteListFragment : MangaListFragment() {
@@ -19,7 +19,7 @@ class RemoteListFragment : MangaListFragment() {
 		parametersOf(source)
 	}
 
-	private val source by parcelableArgument<MangaSource>(ARG_SOURCE)
+	private val source by serializableArgument<MangaSource>(ARG_SOURCE)
 
 	override fun onScrolledToEnd() {
 		viewModel.loadNextPage()
@@ -62,7 +62,7 @@ class RemoteListFragment : MangaListFragment() {
 		private const val ARG_SOURCE = "provider"
 
 		fun newInstance(provider: MangaSource) = RemoteListFragment().withArgs(1) {
-			putParcelable(ARG_SOURCE, provider)
+			putSerializable(ARG_SOURCE, provider)
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
index 36f1bdcca..6408c036e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
@@ -10,8 +10,6 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
@@ -20,6 +18,8 @@ import org.koitharu.kotatsu.list.ui.filter.FilterItem
 import org.koitharu.kotatsu.list.ui.filter.FilterState
 import org.koitharu.kotatsu.list.ui.filter.OnFilterChangedListener
 import org.koitharu.kotatsu.list.ui.model.*
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 
 private const val FILTER_MIN_INTERVAL = 750L
@@ -47,7 +47,7 @@ class RemoteListViewModel(
 		hasNextPage,
 	) { list, mode, filterState, error, hasNext ->
 		buildList(list?.size?.plus(3) ?: 3) {
-			add(ListHeader(repository.title, 0, filterState.sortOrder))
+			add(ListHeader(repository.source.title, 0, filterState.sortOrder))
 			createFilterModel(filterState)?.let { add(it) }
 			when {
 				list.isNullOrEmpty() && error != null -> add(error.toErrorState(canRetry = true))
@@ -64,7 +64,7 @@ class RemoteListViewModel(
 		}
 	}.asLiveDataDistinct(
 		viewModelScope.coroutineContext + Dispatchers.Default,
-		listOf(ListHeader(repository.title, 0, null), LoadingState),
+		listOf(ListHeader(repository.source.title, 0, null), LoadingState),
 	)
 
 	init {
@@ -121,7 +121,7 @@ class RemoteListViewModel(
 		loadingJob = launchLoadingJob(Dispatchers.Default) {
 			try {
 				listError.value = null
-				val list = repository.getList2(
+				val list = repository.getList(
 					offset = if (append) mangaList.value?.size ?: 0 else 0,
 					sortOrder = filterState.sortOrder,
 					tags = filterState.tags,
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt b/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt
index d0b42326b..cdb1ee75a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt
@@ -2,9 +2,8 @@ package org.koitharu.kotatsu.search
 
 import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
-import org.koin.core.qualifier.named
 import org.koin.dsl.module
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.search.domain.MangaSearchRepository
 import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
 import org.koitharu.kotatsu.search.ui.SearchViewModel
@@ -19,7 +18,7 @@ val searchModule
 		factory { MangaSuggestionsProvider.createSuggestions(androidContext()) }
 
 		viewModel { params ->
-			SearchViewModel(get(named(params.get<MangaSource>(0))), params[1], get())
+			SearchViewModel(MangaRepository(params[0]), params[1], get())
 		}
 		viewModel { query ->
 			GlobalSearchViewModel(query.get(), get(), get())
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt b/app/src/main/java/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt
index 8027505f3..a60ee96ac 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt
@@ -10,14 +10,14 @@ import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.levenshteinDistance
 import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
-import org.koitharu.kotatsu.utils.ext.levenshteinDistance
 
 class MangaSearchRepository(
 	private val settings: AppSettings,
@@ -30,7 +30,7 @@ class MangaSearchRepository(
 		settings.getMangaSources(includeHidden = false).asFlow()
 			.flatMapMerge(concurrency) { source ->
 				runCatching {
-					MangaRepository(source).getList2(
+					MangaRepository(source).getList(
 						offset = 0,
 						query = query,
 						sortOrder = SortOrder.POPULARITY
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/MangaListActivity.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
index eb85bc179..151bb2b33 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
@@ -13,8 +13,9 @@ import org.koin.androidx.viewmodel.ext.android.getViewModel
 import org.koin.core.parameter.parametersOf
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaTags
 import org.koitharu.kotatsu.databinding.ActivitySearchGlobalBinding
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
 import org.koitharu.kotatsu.remotelist.ui.RemoteListViewModel
 
@@ -23,7 +24,7 @@ class MangaListActivity : BaseActivity<ActivitySearchGlobalBinding>() {
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivitySearchGlobalBinding.inflate(layoutInflater))
-		val tag = intent.getParcelableExtra<MangaTag>(EXTRA_TAG) ?: run {
+		val tags = intent.getParcelableExtra<ParcelableMangaTags>(EXTRA_TAGS)?.tags ?: run {
 			finishAfterTransition()
 			return
 		}
@@ -31,9 +32,9 @@ class MangaListActivity : BaseActivity<ActivitySearchGlobalBinding>() {
 		val fm = supportFragmentManager
 		if (fm.findFragmentById(R.id.container) == null) {
 			fm.commit {
-				val fragment = RemoteListFragment.newInstance(tag.source)
+				val fragment = RemoteListFragment.newInstance(tags.first().source)
 				replace(R.id.container, fragment)
-				runOnCommit(ApplyFilterRunnable(fragment, tag))
+				runOnCommit(ApplyFilterRunnable(fragment, tags))
 			}
 		}
 	}
@@ -55,23 +56,23 @@ class MangaListActivity : BaseActivity<ActivitySearchGlobalBinding>() {
 
 	private class ApplyFilterRunnable(
 		private val fragment: Fragment,
-		private val tag: MangaTag,
+		private val tags: Set<MangaTag>,
 	) : Runnable {
 
 		override fun run() {
 			val viewModel = fragment.getViewModel<RemoteListViewModel> {
-				parametersOf(tag.source)
+				parametersOf(tags.first().source)
 			}
-			viewModel.applyFilter(setOf(tag))
+			viewModel.applyFilter(tags)
 		}
 	}
 
 	companion object {
 
-		private const val EXTRA_TAG = "tag"
+		private const val EXTRA_TAGS = "tags"
 
-		fun newIntent(context: Context, tag: MangaTag) =
+		fun newIntent(context: Context, tags: Set<MangaTag>) =
 			Intent(context, MangaListActivity::class.java)
-				.putExtra(EXTRA_TAG, tag)
+				.putExtra(EXTRA_TAGS, ParcelableMangaTags(tags))
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt
index 725a11303..94eadf45c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt
@@ -13,8 +13,8 @@ import androidx.fragment.app.commit
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.databinding.ActivitySearchBinding
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionViewModel
 import org.koitharu.kotatsu.utils.ext.showKeyboard
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchFragment.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchFragment.kt
index b74bd5d12..0b25b1648 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchFragment.kt
@@ -2,9 +2,9 @@ package org.koitharu.kotatsu.search.ui
 
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.list.ui.MangaListFragment
-import org.koitharu.kotatsu.utils.ext.parcelableArgument
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.utils.ext.serializableArgument
 import org.koitharu.kotatsu.utils.ext.stringArgument
 import org.koitharu.kotatsu.utils.ext.withArgs
 
@@ -15,7 +15,7 @@ class SearchFragment : MangaListFragment() {
 	}
 
 	private val query by stringArgument(ARG_QUERY)
-	private val source by parcelableArgument<MangaSource>(ARG_SOURCE)
+	private val source by serializableArgument<MangaSource>(ARG_SOURCE)
 
 	override fun onScrolledToEnd() {
 		viewModel.loadNextPage()
@@ -27,7 +27,7 @@ class SearchFragment : MangaListFragment() {
 		private const val ARG_SOURCE = "source"
 
 		fun newInstance(source: MangaSource, query: String) = SearchFragment().withArgs(2) {
-			putParcelable(ARG_SOURCE, source)
+			putSerializable(ARG_SOURCE, source)
 			putString(ARG_QUERY, query)
 		}
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt
index c5c5bdaf6..e20c3bb12 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt
@@ -6,11 +6,11 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 import org.koitharu.kotatsu.list.ui.model.*
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 
 class SearchViewModel(
@@ -78,7 +78,7 @@ class SearchViewModel(
 		loadingJob = launchLoadingJob(Dispatchers.Default) {
 			try {
 				listError.value = null
-				val list = repository.getList2(
+				val list = repository.getList(
 					offset = if (append) mangaList.value?.size ?: 0 else 0,
 					query = query,
 				)
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/global/GlobalSearchViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/global/GlobalSearchViewModel.kt
index 321ee09f8..b516a026a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/global/GlobalSearchViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/global/GlobalSearchViewModel.kt
@@ -6,10 +6,10 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 import org.koitharu.kotatsu.list.ui.model.*
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.search.domain.MangaSearchRepository
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.onFirst
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt
index f6b0c718d..9a942009b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt
@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.search.ui.suggestion
 
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaTag
 
 interface SearchSuggestionListener {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt
index 02e7f2856..109b7bf00 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt
@@ -6,8 +6,8 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.search.domain.MangaSearchRepository
 import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionTagsAD.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionTagsAD.kt
index 3c070edad..25e3eaf7d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionTagsAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionTagsAD.kt
@@ -3,7 +3,7 @@ package org.koitharu.kotatsu.search.ui.suggestion.adapter
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
-import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
 import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionsMangaListAD.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionsMangaListAD.kt
index 9c3eb37b1..49f944449 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionsMangaListAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionsMangaListAD.kt
@@ -11,8 +11,8 @@ import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.databinding.ItemSearchSuggestionMangaGridBinding
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
 import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
 import org.koitharu.kotatsu.utils.ScrollResetCallback
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt
index 369639462..1b89b32d3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt
@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.search.ui.suggestion.model
 
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.areItemsEquals
 
 sealed interface SearchSuggestionItem {
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/AppUpdateChecker.kt b/app/src/main/java/org/koitharu/kotatsu/settings/AppUpdateChecker.kt
index 7a991d675..12d7f21ce 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/AppUpdateChecker.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/AppUpdateChecker.kt
@@ -17,8 +17,8 @@ import org.koitharu.kotatsu.core.github.AppVersion
 import org.koitharu.kotatsu.core.github.GithubRepository
 import org.koitharu.kotatsu.core.github.VersionId
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.parsers.util.byte2HexFormatted
 import org.koitharu.kotatsu.utils.FileSize
-import org.koitharu.kotatsu.utils.ext.byte2HexFormatted
 import java.io.ByteArrayInputStream
 import java.io.InputStream
 import java.security.MessageDigest
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt
index 7a2b992ae..32b40d1b1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt
@@ -18,10 +18,10 @@ import org.koin.android.ext.android.inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.base.ui.dialog.StorageSelectDialog
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.local.data.LocalStorageManager
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.settings.protect.ProtectSetupActivity
 import org.koitharu.kotatsu.settings.utils.SliderPreference
 import org.koitharu.kotatsu.utils.ext.getStorageName
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsActivity.kt
index 562462b82..d70bf45a8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsActivity.kt
@@ -15,8 +15,8 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.databinding.ActivitySettingsBinding
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 class SettingsActivity : BaseActivity<ActivitySettingsBinding>(),
 	PreferenceFragmentCompat.OnPreferenceStartFragmentCallback,
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt
index d15a1e2a4..727f56689 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt
@@ -13,22 +13,21 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
+import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.prefs.SourceSettings
+import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
 import org.koitharu.kotatsu.settings.utils.EditTextBindListener
 import org.koitharu.kotatsu.settings.utils.EditTextDefaultSummaryProvider
-import org.koitharu.kotatsu.utils.ext.mangaRepositoryOf
-import org.koitharu.kotatsu.utils.ext.parcelableArgument
+import org.koitharu.kotatsu.utils.ext.serializableArgument
 import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 import org.koitharu.kotatsu.utils.ext.withArgs
 
 class SourceSettingsFragment : PreferenceFragmentCompat() {
 
-	private val source by parcelableArgument<MangaSource>(EXTRA_SOURCE)
+	private val source by serializableArgument<MangaSource>(EXTRA_SOURCE)
 	private var repository: RemoteMangaRepository? = null
 
 	override fun onResume() {
@@ -38,7 +37,7 @@ class SourceSettingsFragment : PreferenceFragmentCompat() {
 
 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 		preferenceManager.sharedPreferencesName = source.name
-		val repo = mangaRepositoryOf(source) as? RemoteMangaRepository ?: return
+		val repo = MangaRepository(source) as? RemoteMangaRepository ?: return
 		repository = repo
 		addPreferencesFromResource(R.xml.pref_source)
 		val screen = preferenceScreen
@@ -53,8 +52,9 @@ class SourceSettingsFragment : PreferenceFragmentCompat() {
 			}
 		}
 		findPreference<Preference>(SourceSettings.KEY_AUTH)?.run {
-			isVisible = repo is MangaRepositoryAuthProvider
-			isEnabled = (repo as? MangaRepositoryAuthProvider)?.isAuthorized() == false
+			val authProvider = repo.getAuthProvider()
+			isVisible = authProvider != null
+			isEnabled = authProvider?.isAuthorized == false
 		}
 	}
 
@@ -106,7 +106,7 @@ class SourceSettingsFragment : PreferenceFragmentCompat() {
 	private fun loadUsername(preference: Preference) = viewLifecycleScope.launch {
 		runCatching {
 			withContext(Dispatchers.Default) {
-				(repository as MangaRepositoryAuthProvider).getUsername()
+				requireNotNull(repository?.getAuthProvider()?.getUsername())
 			}
 		}.onSuccess { username ->
 			preference.title = getString(R.string.logged_in_as, username)
@@ -123,7 +123,7 @@ class SourceSettingsFragment : PreferenceFragmentCompat() {
 		private const val EXTRA_SOURCE = "source"
 
 		fun newInstance(source: MangaSource) = SourceSettingsFragment().withArgs(1) {
-			putParcelable(EXTRA_SOURCE, source)
+			putSerializable(EXTRA_SOURCE, source)
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
index 44ddad5bc..4e336c181 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
@@ -4,12 +4,12 @@ import androidx.collection.ArraySet
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.MutableLiveData
 import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
 import org.koitharu.kotatsu.utils.ext.map
 import org.koitharu.kotatsu.utils.ext.mapToSet
-import org.koitharu.kotatsu.utils.ext.toTitleCase
 import java.util.*
 
 class OnboardViewModel(
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/protect/ProtectSetupViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/protect/ProtectSetupViewModel.kt
index 0e3950a24..1244c836e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/protect/ProtectSetupViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/protect/ProtectSetupViewModel.kt
@@ -5,9 +5,9 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.parsers.util.md5
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
-import org.koitharu.kotatsu.utils.ext.md5
 
 class ProtectSetupViewModel(
 	private val settings: AppSettings
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsViewModel.kt
index 05b832038..1d9b1c045 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsViewModel.kt
@@ -4,12 +4,12 @@ import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.MutableLiveData
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
 import org.koitharu.kotatsu.utils.ext.map
 import org.koitharu.kotatsu.utils.ext.move
-import org.koitharu.kotatsu.utils.ext.toTitleCase
 import java.util.*
 
 private const val KEY_ENABLED = "!"
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
index e8177e497..53eb9c618 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
@@ -17,27 +17,28 @@ import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.browser.BrowserCallback
 import org.koitharu.kotatsu.browser.BrowserClient
 import org.koitharu.kotatsu.browser.ProgressChromeClient
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
+import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.TaggedActivityResult
-import org.koitharu.kotatsu.utils.ext.mangaRepositoryOf
 import com.google.android.material.R as materialR
 
 class SourceAuthActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
 
-	private lateinit var repository: MangaRepositoryAuthProvider
+	private lateinit var authProvider: MangaParserAuthProvider
 
 	@SuppressLint("SetJavaScriptEnabled")
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityBrowserBinding.inflate(layoutInflater))
-		val source = intent?.getParcelableExtra<MangaSource>(EXTRA_SOURCE)
+		val source = intent?.getSerializableExtra(EXTRA_SOURCE) as? MangaSource
 		if (source == null) {
 			finishAfterTransition()
 			return
 		}
-		repository = mangaRepositoryOf(source) as? MangaRepositoryAuthProvider ?: run {
+		authProvider = (MangaRepository(source) as? RemoteMangaRepository)?.getAuthProvider() ?: run {
 			Toast.makeText(
 				this,
 				getString(R.string.auth_not_supported_by, source.title),
@@ -58,7 +59,7 @@ class SourceAuthActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallba
 		if (savedInstanceState != null) {
 			return
 		}
-		val url = repository.authUrl
+		val url = authProvider.authUrl
 		onTitleChanged(
 			source.title,
 			getString(R.string.loading_)
@@ -111,7 +112,7 @@ class SourceAuthActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallba
 
 	override fun onLoadingStateChanged(isLoading: Boolean) {
 		binding.progressBar.isVisible = isLoading
-		if (!isLoading && repository.isAuthorized()) {
+		if (!isLoading && authProvider.isAuthorized) {
 			Toast.makeText(this, R.string.auth_complete, Toast.LENGTH_SHORT).show()
 			setResult(Activity.RESULT_OK)
 			finishAfterTransition()
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/model/SourceConfigItem.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/model/SourceConfigItem.kt
index dd998ddac..b91e89122 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/model/SourceConfigItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/model/SourceConfigItem.kt
@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.settings.sources.model
 
 import android.net.Uri
 import androidx.annotation.StringRes
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 sealed interface SourceConfigItem {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/suggestions/domain/MangaSuggestion.kt b/app/src/main/java/org/koitharu/kotatsu/suggestions/domain/MangaSuggestion.kt
index 689d8276a..934843362 100644
--- a/app/src/main/java/org/koitharu/kotatsu/suggestions/domain/MangaSuggestion.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/suggestions/domain/MangaSuggestion.kt
@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.suggestions.domain
 
 import androidx.annotation.FloatRange
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
 
 data class MangaSuggestion(
 	val manga: Manga,
diff --git a/app/src/main/java/org/koitharu/kotatsu/suggestions/domain/SuggestionRepository.kt b/app/src/main/java/org/koitharu/kotatsu/suggestions/domain/SuggestionRepository.kt
index aec0a948d..a7bc69ace 100644
--- a/app/src/main/java/org/koitharu/kotatsu/suggestions/domain/SuggestionRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/suggestions/domain/SuggestionRepository.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 import org.koitharu.kotatsu.utils.ext.mapItems
 import org.koitharu.kotatsu.utils.ext.mapToSet
diff --git a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt
index f602e534d..4420d4481 100644
--- a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt
@@ -4,13 +4,13 @@ import android.content.Context
 import androidx.work.*
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.suggestions.domain.MangaSuggestion
 import org.koitharu.kotatsu.suggestions.domain.SuggestionRepository
-import org.koitharu.kotatsu.utils.ext.mangaRepositoryOf
 import java.util.concurrent.TimeUnit
 import kotlin.math.pow
 
@@ -40,9 +40,9 @@ class SuggestionsWorker(appContext: Context, params: WorkerParameters) :
 		}
 		val tagsBySources = allTags.groupBy { x -> x.source }
 		for ((source, tags) in tagsBySources) {
-			val repo = mangaRepositoryOf(source)
+			val repo = MangaRepository(source)
 			tags.flatMapTo(rawResults) { tag ->
-				repo.getList2(
+				repo.getList(
 					offset = 0,
 					sortOrder = SortOrder.UPDATED,
 					tags = setOf(tag),
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt
index 7b5aa6fd2..dd0c4e9ec 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt
@@ -4,7 +4,11 @@ import androidx.room.withTransaction
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.TrackEntity
 import org.koitharu.kotatsu.core.db.entity.TrackLogEntity
-import org.koitharu.kotatsu.core.model.*
+import org.koitharu.kotatsu.core.model.MangaTracking
+import org.koitharu.kotatsu.core.model.TrackingLogItem
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import java.util.*
 
 class TrackingRepository(
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt
index 47a2168ee..62af95924 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt
@@ -12,13 +12,13 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.list.PaginationScrollListener
 import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.databinding.FragmentFeedBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.main.ui.AppBarOwner
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.tracker.ui.adapter.FeedAdapter
 import org.koitharu.kotatsu.tracker.work.TrackWorker
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
index feacf2079..77f465f45 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
@@ -6,9 +6,9 @@ import coil.request.Disposable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.databinding.ItemTracklogBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.tracker.ui.model.FeedItem
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/FeedItem.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/FeedItem.kt
index 1c07b34d8..daf0b5e60 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/FeedItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/FeedItem.kt
@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.tracker.ui.model
 
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
 
 data class FeedItem(
 	val id: Long,
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
index f419521df..885fc830f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
@@ -18,13 +18,13 @@ import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
+import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.PendingIntentCompat
-import org.koitharu.kotatsu.utils.ext.mangaRepositoryOf
 import org.koitharu.kotatsu.utils.ext.referer
 import org.koitharu.kotatsu.utils.ext.toBitmapOrNull
 import org.koitharu.kotatsu.utils.progress.Progress
@@ -59,7 +59,7 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) :
 			.putInt(DATA_TOTAL, tracks.size)
 		for ((index, track) in tracks.withIndex()) {
 			val details = runCatching {
-				mangaRepositoryOf(track.manga.source).getDetails(track.manga)
+				MangaRepository(track.manga.source).getDetails(track.manga)
 			}.getOrNull()
 			workData.putInt(DATA_PROGRESS, index)
 			setProgress(workData.build())
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/DownloadManagerHelper.kt b/app/src/main/java/org/koitharu/kotatsu/utils/DownloadManagerHelper.kt
index 87f42f742..28ea765e1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/DownloadManagerHelper.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/DownloadManagerHelper.kt
@@ -17,9 +17,9 @@ import okhttp3.Cookie
 import okhttp3.CookieJar
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.MangaPage
 import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.utils.ext.toFileNameSafe
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.util.toFileNameSafe
 import java.io.File
 import kotlin.coroutines.resume
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ShareHelper.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ShareHelper.kt
index b06b18d16..9b5e33454 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ShareHelper.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ShareHelper.kt
@@ -6,7 +6,7 @@ import android.net.Uri
 import androidx.core.content.FileProvider
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
 import java.io.File
 
 class ShareHelper(private val context: Context) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
index c9f5a5753..23a6dda8c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
@@ -4,10 +4,7 @@ import android.content.Context
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkRequest
-import android.os.Bundle
-import android.os.Parcelable
-import androidx.appcompat.app.AlertDialog
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import android.net.Uri
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
 
@@ -16,10 +13,12 @@ val Context.connectivityManager: ConnectivityManager
 
 suspend fun ConnectivityManager.waitForNetwork(): Network {
 	val request = NetworkRequest.Builder().build()
-	return suspendCancellableCoroutine<Network> { cont ->
+	return suspendCancellableCoroutine { cont ->
 		val callback = object : ConnectivityManager.NetworkCallback() {
 			override fun onAvailable(network: Network) {
-				cont.resume(network)
+				if (cont.isActive) {
+					cont.resume(network)
+				}
 			}
 		}
 		registerNetworkCallback(request, callback)
@@ -29,12 +28,4 @@ suspend fun ConnectivityManager.waitForNetwork(): Network {
 	}
 }
 
-inline fun buildAlertDialog(context: Context, block: MaterialAlertDialogBuilder.() -> Unit): AlertDialog {
-	return MaterialAlertDialogBuilder(context).apply(block).create()
-}
-
-fun <T : Parcelable> Bundle.requireParcelable(key: String): T {
-	return checkNotNull(getParcelable(key)) {
-		"Value for key $key not found"
-	}
-}
\ No newline at end of file
+fun String.toUriOrNull() = if (isEmpty()) null else Uri.parse(this)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt
index 58797833c..5ba3d0aa2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt
@@ -1,8 +1,6 @@
 package org.koitharu.kotatsu.utils.ext
 
-import androidx.collection.ArrayMap
 import androidx.collection.ArraySet
-import androidx.collection.LongSparseArray
 import java.util.*
 
 fun <T> MutableCollection<T>.replaceWith(subject: Iterable<T>) {
@@ -19,42 +17,12 @@ inline fun <T, R> Collection<T>.mapToSet(transform: (T) -> R): Set<R> {
 	return mapTo(ArraySet(size), transform)
 }
 
-inline fun <T, R> Collection<T>.mapNotNullToSet(transform: (T) -> R?): Set<R> {
-	val destination = ArraySet<R>(size)
-	for (item in this) {
-		destination.add(transform(item) ?: continue)
-	}
-	return destination
+fun LongArray.toArraySet(): Set<Long> = createSet(size) { i -> this[i] }
+
+fun <T : Enum<T>> Array<T>.names() = Array(size) { i ->
+	this[i].name
 }
 
-fun LongArray.toArraySet(): Set<Long> {
-	return when (size) {
-		0 -> emptySet()
-		1 -> setOf(this[0])
-		else -> ArraySet<Long>(size).also { set ->
-			for (item in this) {
-				set.add(item)
-			}
-		}
-	}
-}
-
-fun <K, V> List<Pair<K, V>>.toMutableMap(): MutableMap<K, V> = toMap(ArrayMap(size))
-
-inline fun <T> Collection<T>.associateByLong(selector: (T) -> Long): LongSparseArray<T> {
-	val result = LongSparseArray<T>(size)
-	for (item in this) {
-		result.put(selector(item), item)
-	}
-	return result
-}
-
-inline fun <T, reified R> Array<T>.mapToArray(transform: (T) -> R): Array<R> = Array(size) { i ->
-	transform(get(i))
-}
-
-fun <T : Enum<T>> Array<T>.names() = mapToArray { it.name }
-
 fun <T> Collection<T>.isDistinct(): Boolean {
 	val set = HashSet<T>(size)
 	for (item in this) {
@@ -95,4 +63,23 @@ inline fun <T> List<T>.areItemsEquals(other: List<T>, equals: (T, T) -> Boolean)
 		}
 	}
 	return true
+}
+
+@Suppress("FunctionName")
+inline fun <T> MutableSet(size: Int, init: (index: Int) -> T): MutableSet<T> {
+	val set = ArraySet<T>(size)
+	repeat(size) { index -> set.add(init(index)) }
+	return set
+}
+
+inline fun <T> createSet(size: Int, init: (index: Int) -> T): Set<T> = when (size) {
+	0 -> emptySet()
+	1 -> Collections.singleton(init(0))
+	else -> MutableSet(size, init)
+}
+
+inline fun <T> createList(size: Int, init: (index: Int) -> T): List<T> = when (size) {
+	0 -> emptyList()
+	1 -> Collections.singletonList(init(0))
+	else -> MutableList(size, init)
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CommonExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CommonExt.kt
index abba7dcb5..7e104e0f4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CommonExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CommonExt.kt
@@ -2,9 +2,12 @@ package org.koitharu.kotatsu.utils.ext
 
 import android.content.res.Resources
 import android.util.Log
-import kotlinx.coroutines.delay
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.*
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
+import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
+import org.koitharu.kotatsu.core.exceptions.WrongPasswordException
+import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import java.io.FileNotFoundException
 import java.net.SocketTimeoutException
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CookieJarExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CookieJarExt.kt
deleted file mode 100644
index d188cadbe..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CookieJarExt.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.utils.ext
-
-import okhttp3.Cookie
-import okhttp3.CookieJar
-import okhttp3.HttpUrl
-
-private const val SCHEME_HTTPS = "https"
-
-fun CookieJar.insertCookies(domain: String, vararg cookies: String) {
-	val url = HttpUrl.Builder()
-		.scheme(SCHEME_HTTPS)
-		.host(domain)
-		.build()
-	saveFromResponse(url, cookies.mapNotNull {
-		Cookie.parse(url, it)
-	})
-}
-
-fun CookieJar.getCookies(domain: String): List<Cookie> {
-	val url = HttpUrl.Builder()
-		.scheme(SCHEME_HTTPS)
-		.host(domain)
-		.build()
-	return loadForRequest(url)
-}
-
-fun CookieJar.copyCookies(oldDomain: String, newDomain: String, names: Array<String>? = null) {
-	val url = HttpUrl.Builder()
-		.scheme(SCHEME_HTTPS)
-		.host(oldDomain)
-	var cookies = loadForRequest(url.build())
-	if (names != null) {
-		cookies = cookies.filter { c -> c.name in names }
-	}
-	url.host(newDomain)
-	saveFromResponse(url.build(), cookies)
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/DateExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/DateExt.kt
index c67bba6f8..89a076473 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/DateExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/DateExt.kt
@@ -9,10 +9,6 @@ import java.util.concurrent.TimeUnit
 @SuppressLint("SimpleDateFormat")
 fun Date.format(pattern: String): String = SimpleDateFormat(pattern).format(this)
 
-fun Date.calendar(): Calendar = Calendar.getInstance().also {
-	it.time = this
-}
-
 fun Date.formatRelative(minResolution: Long): CharSequence = DateUtils.getRelativeTimeSpanString(
 	time, System.currentTimeMillis(), minResolution
 )
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FlowExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FlowExt.kt
index ef2f7a422..714c31672 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FlowExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FlowExt.kt
@@ -17,10 +17,4 @@ fun <T> Flow<T>.onFirst(action: suspend (T) -> Unit): Flow<T> {
 
 inline fun <T, R> Flow<List<T>>.mapItems(crossinline transform: (T) -> R): Flow<List<R>> {
 	return map { list -> list.map(transform) }
-}
-
-inline fun <T> Flow<T?>.filterNotNull(
-	crossinline predicate: suspend (T) -> Boolean,
-): Flow<T> = transform { value ->
-	if (value != null && predicate(value)) return@transform emit(value)
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt
index 069d685ff..fd754cb83 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt
@@ -1,12 +1,10 @@
 package org.koitharu.kotatsu.utils.ext
 
-import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.coroutineScope
-import org.koitharu.kotatsu.utils.LifecycleAwareServiceConnection
+import java.io.Serializable
 
 inline fun <T : Fragment> T.withArgs(size: Int, block: Bundle.() -> Unit): T {
 	val b = Bundle(size)
@@ -18,8 +16,7 @@ inline fun <T : Fragment> T.withArgs(size: Int, block: Bundle.() -> Unit): T {
 val Fragment.viewLifecycleScope
 	inline get() = viewLifecycleOwner.lifecycle.coroutineScope
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun <T : Parcelable> Fragment.parcelableArgument(name: String): Lazy<T> {
+fun <T : Parcelable> Fragment.parcelableArgument(name: String): Lazy<T> {
 	return lazy(LazyThreadSafetyMode.NONE) {
 		requireNotNull(arguments?.getParcelable(name)) {
 			"No argument $name passed into ${javaClass.simpleName}"
@@ -27,13 +24,14 @@ inline fun <T : Parcelable> Fragment.parcelableArgument(name: String): Lazy<T> {
 	}
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun Fragment.stringArgument(name: String) = lazy(LazyThreadSafetyMode.NONE) {
-	arguments?.getString(name)
+inline fun <reified T : Serializable> Fragment.serializableArgument(name: String): Lazy<T> {
+	return lazy(LazyThreadSafetyMode.NONE) {
+		requireNotNull(arguments?.getSerializable(name) as? T) {
+			"No argument $name passed into ${javaClass.simpleName}"
+		}
+	}
 }
 
-fun Fragment.bindService(
-	lifecycleOwner: LifecycleOwner,
-	service: Intent,
-	flags: Int,
-) = LifecycleAwareServiceConnection.bindService(requireActivity(), lifecycleOwner, service, flags)
\ No newline at end of file
+fun Fragment.stringArgument(name: String) = lazy(LazyThreadSafetyMode.NONE) {
+	arguments?.getString(name)
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/HttpExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/HttpExt.kt
deleted file mode 100644
index 8121de6bb..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/HttpExt.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.koitharu.kotatsu.utils.ext
-
-import kotlinx.coroutines.suspendCancellableCoroutine
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Response
-import org.koitharu.kotatsu.core.network.CommonHeaders
-import java.io.IOException
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-
-suspend fun Call.await() = suspendCancellableCoroutine<Response> { cont ->
-	this.enqueue(object : Callback {
-		override fun onFailure(call: Call, e: IOException) {
-			if (cont.isActive) {
-				cont.resumeWithException(e)
-			}
-		}
-
-		override fun onResponse(call: Call, response: Response) {
-			if (cont.isActive) {
-				cont.resume(response)
-			}
-		}
-	})
-	cont.invokeOnCancellation {
-		this.cancel()
-	}
-}
-
-val Response.mimeType: String?
-	get() = body?.contentType()?.run { "$type/$subtype" }
-
-val Response.contentDisposition: String?
-	get() = header(CommonHeaders.CONTENT_DISPOSITION)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/IteratorExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/IteratorExt.kt
deleted file mode 100644
index 660bd7b2f..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/IteratorExt.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.utils.ext
-
-fun <T> Iterator<T>.nextOrNull(): T? = if (hasNext()) next() else null
-
-fun <T> Iterator<T>.toList(): List<T> {
-	if (!hasNext()) {
-		return emptyList()
-	}
-	val list = ArrayList<T>()
-	while (hasNext()) list += next()
-	return list
-}
-
-fun <T> Iterator<T>.toSet(): Set<T> {
-	if (!hasNext()) {
-		return emptySet()
-	}
-	val list = LinkedHashSet<T>()
-	while (hasNext()) list += next()
-	return list
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/JsonExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/JsonExt.kt
deleted file mode 100644
index f5c55b49d..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/JsonExt.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.koitharu.kotatsu.utils.ext
-
-import androidx.collection.ArraySet
-import org.json.JSONArray
-import org.json.JSONObject
-import org.koitharu.kotatsu.utils.json.JSONIterator
-import org.koitharu.kotatsu.utils.json.JSONStringIterator
-import org.koitharu.kotatsu.utils.json.JSONValuesIterator
-import kotlin.contracts.contract
-
-inline fun <R, C : MutableCollection<in R>> JSONArray.mapTo(
-	destination: C,
-	block: (JSONObject) -> R
-): C {
-	val len = length()
-	for (i in 0 until len) {
-		val jo = getJSONObject(i)
-		destination.add(block(jo))
-	}
-	return destination
-}
-
-inline fun <R, C : MutableCollection<in R>> JSONArray.mapNotNullTo(
-	destination: C,
-	block: (JSONObject) -> R?
-): C {
-	val len = length()
-	for (i in 0 until len) {
-		val jo = getJSONObject(i)
-		destination.add(block(jo) ?: continue)
-	}
-	return destination
-}
-
-inline fun <T> JSONArray.map(block: (JSONObject) -> T): List<T> {
-	return mapTo(ArrayList(length()), block)
-}
-
-inline fun <T> JSONArray.mapNotNull(block: (JSONObject) -> T?): List<T> {
-	return mapNotNullTo(ArrayList(length()), block)
-}
-
-fun <T> JSONArray.mapIndexed(block: (Int, JSONObject) -> T): List<T> {
-	val len = length()
-	val result = ArrayList<T>(len)
-	for (i in 0 until len) {
-		val jo = getJSONObject(i)
-		result.add(block(i, jo))
-	}
-	return result
-}
-
-fun JSONObject.getStringOrNull(name: String): String? = opt(name)?.takeUnless {
-	it === JSONObject.NULL
-}?.toString()?.takeUnless {
-	it.isEmpty()
-}
-
-fun JSONObject.getBooleanOrDefault(name: String, defaultValue: Boolean): Boolean = opt(name)?.takeUnless {
-	it === JSONObject.NULL
-} as? Boolean ?: defaultValue
-
-fun JSONObject.getLongOrDefault(name: String, defaultValue: Long): Long = opt(name)?.takeUnless {
-	it === JSONObject.NULL
-} as? Long ?: defaultValue
-
-operator fun JSONArray.iterator(): Iterator<JSONObject> = JSONIterator(this)
-
-fun JSONArray.stringIterator(): Iterator<String> = JSONStringIterator(this)
-
-fun <T> JSONArray.mapToSet(block: (JSONObject) -> T): Set<T> {
-	val len = length()
-	val result = ArraySet<T>(len)
-	for (i in 0 until len) {
-		val jo = getJSONObject(i)
-		result.add(block(jo))
-	}
-	return result
-}
-
-fun JSONObject.values(): Iterator<Any> = JSONValuesIterator(this)
-
-fun JSONArray.associateByKey(key: String): Map<String, JSONObject> {
-	val destination = LinkedHashMap<String, JSONObject>(length())
-	repeat(length()) { i ->
-		val item = getJSONObject(i)
-		val keyValue = item.getString(key)
-		destination[keyValue] = item
-	}
-	return destination
-}
-
-fun JSONArray?.isNullOrEmpty(): Boolean {
-	contract {
-		returns(false) implies (this@isNullOrEmpty != null)
-	}
-
-	return this == null || this.length() == 0
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/KoinExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/KoinExt.kt
deleted file mode 100644
index 8d71b09bb..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/KoinExt.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.koitharu.kotatsu.utils.ext
-
-import android.content.ComponentCallbacks
-import org.koin.android.ext.android.get
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-import org.koin.core.qualifier.named
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.parser.MangaRepository
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun ComponentCallbacks.mangaRepositoryOf(source: MangaSource): MangaRepository {
-	return get(named(source))
-}
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun KoinComponent.mangaRepositoryOf(source: MangaSource): MangaRepository {
-	return get(named(source))
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/LiveDataExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/LiveDataExt.kt
index 97b5732a3..03123c692 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/LiveDataExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/LiveDataExt.kt
@@ -17,16 +17,6 @@ fun <T> LiveData<T?>.observeNotNull(owner: LifecycleOwner, observer: Observer<T>
 	}
 }
 
-fun <T> LiveData<T>.observeDistinct(owner: LifecycleOwner, observer: Observer<T>) {
-	var previousValue: T? = null
-	this.observe(owner) {
-		if (it != previousValue) {
-			observer.onChanged(it)
-			previousValue = it
-		}
-	}
-}
-
 fun <T> LiveData<T>.observeWithPrevious(owner: LifecycleOwner, observer: BufferedObserver<T>) {
 	var previous: T? = null
 	this.observe(owner) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/LocaleExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/LocaleExt.kt
index 26cc037d6..b07b0c41d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/LocaleExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/LocaleExt.kt
@@ -3,13 +3,7 @@ package org.koitharu.kotatsu.utils.ext
 import androidx.core.os.LocaleListCompat
 import java.util.*
 
-fun LocaleListCompat.toList(): List<Locale> {
-	val list = ArrayList<Locale>(size())
-	for (i in 0 until size()) {
-		list += get(i)
-	}
-	return list
-}
+fun LocaleListCompat.toList(): List<Locale> = createList(size()) { i -> get(i) }
 
 operator fun LocaleListCompat.iterator() = object : Iterator<Locale> {
 	private var index = 0
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ParseExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ParseExt.kt
deleted file mode 100644
index 4da5a2cff..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ParseExt.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.koitharu.kotatsu.utils.ext
-
-import okhttp3.Response
-import okhttp3.internal.closeQuietly
-import org.json.JSONArray
-import org.json.JSONObject
-import org.jsoup.Jsoup
-import org.jsoup.internal.StringUtil
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import org.jsoup.nodes.Node
-import org.jsoup.select.Elements
-import java.text.DateFormat
-
-fun Response.parseHtml(): Document {
-	try {
-		(body?.byteStream() ?: throw NullPointerException("Response body is null")).use { stream ->
-			val charset = body!!.contentType()?.charset()?.name()
-			return Jsoup.parse(
-				stream,
-				charset,
-				request.url.toString()
-			)
-		}
-	} finally {
-		closeQuietly()
-	}
-}
-
-fun Response.parseJson(): JSONObject {
-	try {
-		val string = body?.string() ?: throw NullPointerException("Response body is null")
-		return JSONObject(string)
-	} finally {
-		closeQuietly()
-	}
-}
-
-fun Response.parseJsonArray(): JSONArray {
-	try {
-		val string = body?.string() ?: throw NullPointerException("Response body is null")
-		return JSONArray(string)
-	} finally {
-		closeQuietly()
-	}
-}
-
-inline fun Elements.findOwnText(predicate: (String) -> Boolean): String? {
-	for (x in this) {
-		val ownText = x.ownText()
-		if (predicate(ownText)) {
-			return ownText
-		}
-	}
-	return null
-}
-
-inline fun Elements.findText(predicate: (String) -> Boolean): String? {
-	for (x in this) {
-		val text = x.text()
-		if (predicate(text)) {
-			return text
-		}
-	}
-	return null
-}
-
-fun String.inContextOf(node: Node): String {
-	return if (this.isEmpty()) {
-		""
-	} else {
-		StringUtil.resolve(node.baseUri(), this)
-	}
-}
-
-fun String.toRelativeUrl(domain: String): String {
-	if (isEmpty() || startsWith("/")) {
-		return this
-	}
-	return replace(Regex("^[^/]{2,6}://${Regex.escape(domain)}+/", RegexOption.IGNORE_CASE), "/")
-}
-
-fun Element.relUrl(attributeKey: String): String {
-	val attr = attr(attributeKey).trim()
-	if (attr.isEmpty()) {
-		return ""
-	}
-	if (attr.startsWith("/")) {
-		return attr
-	}
-	val baseUrl = REGEX_URL_BASE.find(baseUri())?.value ?: return attr
-	return attr.removePrefix(baseUrl.dropLast(1))
-}
-
-private val REGEX_URL_BASE = Regex("^[^/]{2,6}://[^/]+/", RegexOption.IGNORE_CASE)
-
-fun Element.css(property: String): String? {
-	val regex = Regex("${Regex.escape(property)}\\s*:\\s*[^;]+")
-	val css = attr("style").find(regex) ?: return null
-	return css.substringAfter(':').removeSuffix(';').trim()
-}
-
-fun DateFormat.tryParse(str: String?): Long = if (str.isNullOrEmpty()) {
-	0L
-} else {
-	runCatching {
-		parse(str)?.time ?: 0L
-	}.getOrDefault(0L)
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/PrimitiveExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/PrimitiveExt.kt
index 29c3a67f0..14e7cbb9d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/PrimitiveExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/PrimitiveExt.kt
@@ -24,20 +24,4 @@ fun Number.format(decimals: Int = 0, decPoint: Char = '.', thousandsSep: Char? =
 	}
 }
 
-fun Float.toIntUp(): Int {
-	val intValue = toInt()
-	return if (this == intValue.toFloat()) {
-		intValue
-	} else {
-		intValue + 1
-	}
-}
-
-infix fun Int.upBy(step: Int): Int {
-	val mod = this % step
-	return if (mod == 0) {
-		this
-	} else {
-		this - mod + step
-	}
-}
\ No newline at end of file
+inline fun Int.ifZero(defaultValue: () -> Int): Int = if (this == 0) defaultValue() else this
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/StringExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/StringExt.kt
deleted file mode 100644
index 4d60ff637..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/StringExt.kt
+++ /dev/null
@@ -1,240 +0,0 @@
-package org.koitharu.kotatsu.utils.ext
-
-import android.net.Uri
-import androidx.collection.arraySetOf
-import java.math.BigInteger
-import java.net.URLEncoder
-import java.security.MessageDigest
-import java.util.*
-import kotlin.math.min
-
-fun String.longHashCode(): Long {
-	var h = 1125899906842597L
-	val len: Int = this.length
-	for (i in 0 until len) {
-		h = 31 * h + this[i].code
-	}
-	return h
-}
-
-fun String.removeSurrounding(vararg chars: Char): String {
-	if (isEmpty()) {
-		return this
-	}
-	for (c in chars) {
-		if (first() == c && last() == c) {
-			return substring(1, length - 1)
-		}
-	}
-	return this
-}
-
-fun String.toCamelCase(): String {
-	if (isEmpty()) {
-		return this
-	}
-	val result = StringBuilder(length)
-	var capitalize = true
-	for (char in this) {
-		result.append(
-			if (capitalize) {
-				char.uppercase()
-			} else {
-				char.lowercase()
-			}
-		)
-		capitalize = char.isWhitespace()
-	}
-	return result.toString()
-}
-
-fun String.toTitleCase(): String {
-	return replaceFirstChar { x -> x.uppercase() }
-}
-
-fun String.toTitleCase(locale: Locale): String {
-	return replaceFirstChar { x -> x.uppercase(locale) }
-}
-
-fun String.transliterate(skipMissing: Boolean): String {
-	val cyr = charArrayOf(
-		'а', 'б', 'в', 'г', 'д', 'е', 'ж', 'з', 'и', 'й', 'к', 'л', 'м', 'н', 'о', 'п',
-		'р', 'с', 'т', 'у', 'ф', 'х', 'ц', 'ч', 'ш', 'щ', 'ъ', 'ы', 'ь', 'э', 'ю', 'я', 'ё', 'ў'
-	)
-	val lat = arrayOf(
-		"a", "b", "v", "g", "d", "e", "zh", "z", "i", "y", "k", "l", "m", "n", "o", "p",
-		"r", "s", "t", "u", "f", "h", "ts", "ch", "sh", "sch", "", "i", "", "e", "ju", "ja", "jo", "w"
-	)
-	return buildString(length + 5) {
-		for (c in this@transliterate) {
-			val p = cyr.binarySearch(c.lowercaseChar())
-			if (p in lat.indices) {
-				if (c.isUpperCase()) {
-					append(lat[p].uppercase())
-				} else {
-					append(lat[p])
-				}
-			} else if (!skipMissing) {
-				append(c)
-			}
-		}
-	}
-}
-
-fun String.toFileNameSafe() = this.transliterate(false)
-	.replace(Regex("[^a-z0-9_\\-]", arraySetOf(RegexOption.IGNORE_CASE)), " ")
-	.replace(Regex("\\s+"), "_")
-
-fun String.ellipsize(maxLength: Int) = if (this.length > maxLength) {
-	this.take(maxLength - 1) + Typography.ellipsis
-} else this
-
-fun String.splitTwoParts(delimiter: Char): Pair<String, String>? {
-	val indices = ArrayList<Int>(4)
-	for ((i, c) in this.withIndex()) {
-		if (c == delimiter) {
-			indices += i
-		}
-	}
-	if (indices.isEmpty() || indices.size and 1 == 0) {
-		return null
-	}
-	val index = indices[indices.size / 2]
-	return substring(0, index) to substring(index + 1)
-}
-
-fun String.urlEncoded(): String = URLEncoder.encode(this, Charsets.UTF_8.name())
-
-fun String.toUriOrNull(): Uri? = if (isEmpty()) {
-	null
-} else {
-	Uri.parse(this)
-}
-
-fun ByteArray.byte2HexFormatted(): String {
-	val str = StringBuilder(size * 2)
-	for (i in indices) {
-		var h = Integer.toHexString(this[i].toInt())
-		val l = h.length
-		if (l == 1) {
-			h = "0$h"
-		}
-		if (l > 2) {
-			h = h.substring(l - 2, l)
-		}
-		str.append(h.uppercase(Locale.ROOT))
-		if (i < size - 1) {
-			str.append(':')
-		}
-	}
-	return str.toString()
-}
-
-fun String.md5(): String {
-	val md = MessageDigest.getInstance("MD5")
-	return BigInteger(1, md.digest(toByteArray()))
-		.toString(16)
-		.padStart(32, '0')
-}
-
-fun String.substringBetween(from: String, to: String, fallbackValue: String = this): String {
-	val fromIndex = indexOf(from)
-	if (fromIndex == -1) {
-		return fallbackValue
-	}
-	val toIndex = lastIndexOf(to)
-	return if (toIndex == -1) {
-		fallbackValue
-	} else {
-		substring(fromIndex + from.length, toIndex)
-	}
-}
-
-fun String.substringBetweenFirst(from: String, to: String): String? {
-	val fromIndex = indexOf(from)
-	if (fromIndex == -1) {
-		return null
-	}
-	val toIndex = indexOf(to, fromIndex)
-	return if (toIndex == -1) {
-		null
-	} else {
-		substring(fromIndex + from.length, toIndex)
-	}
-}
-
-fun String.substringBetweenLast(from: String, to: String, fallbackValue: String = this): String {
-	val fromIndex = lastIndexOf(from)
-	if (fromIndex == -1) {
-		return fallbackValue
-	}
-	val toIndex = lastIndexOf(to)
-	return if (toIndex == -1) {
-		fallbackValue
-	} else {
-		substring(fromIndex + from.length, toIndex)
-	}
-}
-
-fun String.find(regex: Regex) = regex.find(this)?.value
-
-fun String.removeSuffix(suffix: Char): String {
-	if (lastOrNull() == suffix) {
-		return substring(0, length - 1)
-	}
-	return this
-}
-
-fun String.levenshteinDistance(other: String): Int {
-	if (this == other) {
-		return 0
-	}
-	if (this.isEmpty()) {
-		return other.length
-	}
-	if (other.isEmpty()) {
-		return this.length
-	}
-
-	val lhsLength = this.length + 1
-	val rhsLength = other.length + 1
-
-	var cost = Array(lhsLength) { it }
-	var newCost = Array(lhsLength) { 0 }
-
-	for (i in 1 until rhsLength) {
-		newCost[0] = i
-
-		for (j in 1 until lhsLength) {
-			val match = if (this[j - 1] == other[i - 1]) 0 else 1
-
-			val costReplace = cost[j - 1] + match
-			val costInsert = cost[j] + 1
-			val costDelete = newCost[j - 1] + 1
-
-			newCost[j] = min(min(costInsert, costDelete), costReplace)
-		}
-
-		val swap = cost
-		cost = newCost
-		newCost = swap
-	}
-
-	return cost[lhsLength - 1]
-}
-
-inline fun <T> Appendable.appendAll(
-	items: Iterable<T>,
-	separator: CharSequence,
-	transform: (T) -> CharSequence = { it.toString() },
-) {
-	var isFirst = true
-	for (item in items) {
-		if (isFirst) {
-			isFirst = false
-		} else {
-			append(separator)
-		}
-		append(transform(item))
-	}
-}
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
index 243356b1d..69a4a3bcc 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
@@ -5,15 +5,12 @@ import android.graphics.Rect
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.View
-import android.view.View.MeasureSpec
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import androidx.annotation.LayoutRes
 import androidx.annotation.MenuRes
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.view.children
-import androidx.core.view.isVisible
-import androidx.drawerlayout.widget.DrawerLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
@@ -65,23 +62,6 @@ inline fun View.showPopupMenu(
 	menu.show()
 }
 
-fun ViewGroup.hitTest(x: Int, y: Int): Set<View> {
-	val result = HashSet<View>(4)
-	val rect = Rect()
-	for (child in children) {
-		if (child.isVisible && child.getGlobalVisibleRect(rect)) {
-			if (rect.contains(x, y)) {
-				if (child is ViewGroup) {
-					result += child.hitTest(x, y)
-				} else {
-					result += child
-				}
-			}
-		}
-	}
-	return result
-}
-
 fun View.hasGlobalPoint(x: Int, y: Int): Boolean {
 	if (visibility != View.VISIBLE) {
 		return false
@@ -91,14 +71,6 @@ fun View.hasGlobalPoint(x: Int, y: Int): Boolean {
 	return rect.contains(x, y)
 }
 
-fun DrawerLayout.toggleDrawer(gravity: Int) {
-	if (isDrawerOpen(gravity)) {
-		closeDrawer(gravity)
-	} else {
-		openDrawer(gravity)
-	}
-}
-
 fun View.measureHeight(): Int {
 	val vh = height
 	return if (vh == 0) {
@@ -179,32 +151,6 @@ fun BaseProgressIndicator<*>.setIndeterminateCompat(indeterminate: Boolean) {
 	}
 }
 
-fun resolveAdjustedSize(
-	desiredSize: Int,
-	maxSize: Int,
-	measureSpec: Int,
-): Int {
-	val specMode = MeasureSpec.getMode(measureSpec)
-	val specSize = MeasureSpec.getSize(measureSpec)
-	return when (specMode) {
-		MeasureSpec.UNSPECIFIED ->
-			// Parent says we can be as big as we want. Just don't be larger
-			// than max size imposed on ourselves.
-			desiredSize.coerceAtMost(maxSize)
-		MeasureSpec.AT_MOST ->
-			// Parent says we can be as big as we want, up to specSize.
-			// Don't be larger than specSize, and don't be larger than
-			// the max size imposed on ourselves.
-			desiredSize.coerceAtMost(specSize).coerceAtMost(maxSize)
-		MeasureSpec.EXACTLY ->
-			// No choice. Do what we are told.
-			specSize
-		else ->
-			// This should not happen
-			desiredSize
-	}
-}
-
 fun Slider.setValueRounded(newValue: Float) {
 	val step = stepSize
 	value = (newValue / step).roundToInt() * step
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/json/JSONIterator.kt b/app/src/main/java/org/koitharu/kotatsu/utils/json/JSONIterator.kt
deleted file mode 100644
index 9b48640e2..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/json/JSONIterator.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.utils.json
-
-import org.json.JSONArray
-import org.json.JSONObject
-
-class JSONIterator(private val array: JSONArray) : Iterator<JSONObject> {
-
-	private val total = array.length()
-	private var index = 0
-
-	override fun hasNext() = index < total
-
-	override fun next(): JSONObject = array.getJSONObject(index++)
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/json/JSONStringIterator.kt b/app/src/main/java/org/koitharu/kotatsu/utils/json/JSONStringIterator.kt
deleted file mode 100644
index dd9826407..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/json/JSONStringIterator.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.utils.json
-
-import org.json.JSONArray
-
-class JSONStringIterator(private val array: JSONArray) : Iterator<String> {
-
-	private val total = array.length()
-	private var index = 0
-
-	override fun hasNext() = index < total
-
-	override fun next(): String = array.getString(index++)
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/json/JsonValuesIterator.kt b/app/src/main/java/org/koitharu/kotatsu/utils/json/JsonValuesIterator.kt
deleted file mode 100644
index 1bf833310..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/json/JsonValuesIterator.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.koitharu.kotatsu.utils.json
-
-import org.json.JSONObject
-
-class JSONValuesIterator(
-	private val jo: JSONObject,
-): Iterator<Any> {
-
-	private val keyIterator = jo.keys()
-
-	override fun hasNext(): Boolean = keyIterator.hasNext()
-
-	override fun next(): Any {
-		val key = keyIterator.next()
-		return jo.get(key)
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/widget/WidgetUpdater.kt b/app/src/main/java/org/koitharu/kotatsu/widget/WidgetUpdater.kt
index 3cc3be08e..ee11b02c6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/widget/WidgetUpdater.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/widget/WidgetUpdater.kt
@@ -10,9 +10,9 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.retry
 import kotlinx.coroutines.plus
-import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 import org.koitharu.kotatsu.widget.recent.RecentWidgetProvider
 import org.koitharu.kotatsu.widget.shelf.ShelfWidgetProvider
diff --git a/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt b/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt
index 673bca9c0..3e4125a21 100644
--- a/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt
@@ -10,8 +10,8 @@ import coil.request.ImageRequest
 import kotlinx.coroutines.runBlocking
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaIntent
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.requireBitmap
 import java.io.IOException
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt
index ac868a7f0..61fd0d9ab 100644
--- a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt
@@ -10,9 +10,9 @@ import coil.request.ImageRequest
 import kotlinx.coroutines.runBlocking
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaIntent
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.prefs.AppWidgetConfig
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.requireBitmap
 import java.io.IOException
 
diff --git a/app/src/test/java/org/koitharu/kotatsu/core/network/TestCookieJar.kt b/app/src/test/java/org/koitharu/kotatsu/core/network/TestCookieJar.kt
deleted file mode 100644
index 45fee5711..000000000
--- a/app/src/test/java/org/koitharu/kotatsu/core/network/TestCookieJar.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import okhttp3.Cookie
-import okhttp3.CookieJar
-import okhttp3.HttpUrl
-
-class TestCookieJar : CookieJar {
-
-	private val cache = HashMap<CookieKey, Cookie>()
-
-	override fun loadForRequest(url: HttpUrl): List<Cookie> {
-		val time = System.currentTimeMillis()
-		return cache.values.filter { it.matches(url) && it.expiresAt >= time }
-	}
-
-	override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
-		cookies.forEach {
-			val key = CookieKey(url.host, it.name)
-			cache[key] = it
-		}
-	}
-
-	private data class CookieKey(
-		val host: String,
-		val name: String
-	)
-}
\ No newline at end of file
diff --git a/app/src/test/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepositoryTest.kt b/app/src/test/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepositoryTest.kt
deleted file mode 100644
index 15dc56d4f..000000000
--- a/app/src/test/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepositoryTest.kt
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import com.google.common.truth.Truth
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.Parameterized
-import org.koin.core.component.inject
-import org.koin.core.logger.Level
-import org.koin.core.parameter.parametersOf
-import org.koin.test.KoinTest
-import org.koin.test.KoinTestRule
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.SortOrder
-import org.koitharu.kotatsu.utils.CoroutineTestRule
-import org.koitharu.kotatsu.utils.TestResponse
-import org.koitharu.kotatsu.utils.ext.mapToSet
-import org.koitharu.kotatsu.utils.ext.medianOrNull
-import org.koitharu.kotatsu.utils.isAbsoluteUrl
-import org.koitharu.kotatsu.utils.isNotAbsoluteUrl
-
-@RunWith(Parameterized::class)
-class RemoteMangaRepositoryTest(private val source: MangaSource) : KoinTest {
-
-	private val repo by inject<RemoteMangaRepository> {
-		parametersOf(source)
-	}
-
-	@get:Rule
-	val koinTestRule = KoinTestRule.create {
-		printLogger(Level.ERROR)
-		modules(repositoryTestModule, parserModule)
-	}
-
-	@get:Rule
-	val coroutineTestRule = CoroutineTestRule()
-
-	@Test
-	fun list() = coroutineTestRule.runBlockingTest {
-		val list = repo.getList2(20, query = null, sortOrder = SortOrder.POPULARITY, tags = null)
-		checkMangaList(list)
-	}
-
-	@Test
-	fun search() = coroutineTestRule.runBlockingTest {
-		val subject = repo.getList2(20, query = null, sortOrder = SortOrder.POPULARITY, tags = null)
-			.first()
-		val list = repo.getList2(offset = 0, query = subject.title, sortOrder = null, tags = null)
-		checkMangaList(list)
-		Truth.assertThat(list.map { it.url }).contains(subject.url)
-	}
-
-	@Test
-	fun tags() = coroutineTestRule.runBlockingTest {
-		val tags = repo.getTags()
-		Truth.assertThat(tags).isNotEmpty()
-		val keys = tags.map { it.key }
-		Truth.assertThat(keys).containsNoDuplicates()
-		Truth.assertThat(keys).doesNotContain("")
-		val titles = tags.map { it.title }
-		Truth.assertThat(titles).containsNoDuplicates()
-		Truth.assertThat(titles).doesNotContain("")
-		Truth.assertThat(tags.mapToSet { it.source }).containsExactly(source)
-
-		val list = repo.getList2(offset = 0, tags = setOf(tags.last()), query = null, sortOrder = null)
-		checkMangaList(list)
-	}
-
-	@Test
-	fun details() = coroutineTestRule.runBlockingTest {
-		val list = repo.getList2(20, query = null, sortOrder = SortOrder.POPULARITY, tags = null)
-		val manga = list.first()
-		println(manga.title + ": " + manga.url)
-		val details = repo.getDetails(manga)
-
-		Truth.assertThat(details.chapters).isNotEmpty()
-		Truth.assertThat(details.publicUrl).isAbsoluteUrl()
-		Truth.assertThat(details.description).isNotNull()
-		Truth.assertThat(details.title).startsWith(manga.title)
-		Truth.assertThat(details.source).isEqualTo(source)
-
-		Truth.assertThat(details.chapters?.map { it.id }).containsNoDuplicates()
-		Truth.assertThat(details.chapters?.map { it.number }).containsNoDuplicates()
-		Truth.assertThat(details.chapters?.map { it.name }).doesNotContain("")
-		Truth.assertThat(details.chapters?.mapToSet { it.source }).containsExactly(source)
-	}
-
-	@Test
-	fun pages() = coroutineTestRule.runBlockingTest {
-		val list = repo.getList2(20, query = null, sortOrder = SortOrder.POPULARITY, tags = null)
-		val manga = list.first()
-		println(manga.title + ": " + manga.url)
-		val chapter = repo.getDetails(manga).chapters?.firstOrNull() ?: error("Chapter is null")
-		val pages = repo.getPages(chapter)
-
-		Truth.assertThat(pages).isNotEmpty()
-		Truth.assertThat(pages.map { it.id }).containsNoDuplicates()
-		Truth.assertThat(pages.mapToSet { it.source }).containsExactly(source)
-
-		val page = pages.medianOrNull() ?: error("No page")
-		val pageUrl = repo.getPageUrl(page)
-		Truth.assertThat(pageUrl).isNotEmpty()
-		Truth.assertThat(pageUrl).isAbsoluteUrl()
-		val pageResponse = TestResponse.testRequest(pageUrl)
-		Truth.assertThat(pageResponse.code).isIn(200..299)
-		Truth.assertThat(pageResponse.type).isEqualTo("image")
-	}
-
-	private fun checkMangaList(list: List<Manga>) {
-		Truth.assertThat(list).isNotEmpty()
-		Truth.assertThat(list.map { it.id }).containsNoDuplicates()
-		for (item in list) {
-			Truth.assertThat(item.url).isNotEmpty()
-			Truth.assertThat(item.url).isNotAbsoluteUrl()
-			Truth.assertThat(item.coverUrl).isAbsoluteUrl()
-			Truth.assertThat(item.title).isNotEmpty()
-			Truth.assertThat(item.publicUrl).isAbsoluteUrl()
-		}
-	}
-
-	companion object {
-
-		@JvmStatic
-		@Parameterized.Parameters(name = "{0}")
-		fun getProviders() = (MangaSource.values().toList() - MangaSource.LOCAL).toTypedArray()
-	}
-}
\ No newline at end of file
diff --git a/app/src/test/java/org/koitharu/kotatsu/core/parser/RepositoryTestModule.kt b/app/src/test/java/org/koitharu/kotatsu/core/parser/RepositoryTestModule.kt
deleted file mode 100644
index 7a808c8bf..000000000
--- a/app/src/test/java/org/koitharu/kotatsu/core/parser/RepositoryTestModule.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import com.koushikdutta.quack.QuackContext
-import okhttp3.CookieJar
-import okhttp3.OkHttpClient
-import org.koin.dsl.module
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.network.TestCookieJar
-import org.koitharu.kotatsu.core.network.UserAgentInterceptor
-import org.koitharu.kotatsu.core.prefs.SourceSettings
-import java.util.concurrent.TimeUnit
-
-val repositoryTestModule
-	get() = module {
-		single<CookieJar> { TestCookieJar() }
-		factory {
-			OkHttpClient.Builder()
-				.cookieJar(get())
-				.addInterceptor(UserAgentInterceptor())
-				.connectTimeout(20, TimeUnit.SECONDS)
-				.readTimeout(60, TimeUnit.SECONDS)
-				.writeTimeout(20, TimeUnit.SECONDS)
-				.build()
-		}
-		single<MangaLoaderContext> {
-			object : MangaLoaderContext(get(), get()) {
-				override fun getSettings(source: MangaSource): SourceSettings {
-					return SourceSettingsStub()
-				}
-
-				override suspend fun evaluateJs(script: String): String? {
-					return QuackContext.create().use {
-						it.evaluate(script)?.toString()
-					}
-				}
-			}
-		}
-	}
\ No newline at end of file
diff --git a/app/src/test/java/org/koitharu/kotatsu/core/parser/SourceSettingsStub.kt b/app/src/test/java/org/koitharu/kotatsu/core/parser/SourceSettingsStub.kt
deleted file mode 100644
index 2c2f27461..000000000
--- a/app/src/test/java/org/koitharu/kotatsu/core/parser/SourceSettingsStub.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import org.koitharu.kotatsu.core.prefs.SourceSettings
-
-class SourceSettingsStub : SourceSettings {
-
-	override fun getDomain(defaultValue: String) = defaultValue
-
-	override fun isUseSsl(defaultValue: Boolean) = defaultValue
-}
\ No newline at end of file
diff --git a/app/src/test/java/org/koitharu/kotatsu/utils/TestResponse.kt b/app/src/test/java/org/koitharu/kotatsu/utils/TestResponse.kt
deleted file mode 100644
index 2fcc3e18f..000000000
--- a/app/src/test/java/org/koitharu/kotatsu/utils/TestResponse.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-
-data class TestResponse(
-	val code: Int,
-	val type: String?,
-	val subtype: String?,
-) {
-
-	companion object : KoinComponent {
-
-		private val okHttp by inject<OkHttpClient>()
-
-		fun testRequest(url: String): TestResponse {
-			val request = Request.Builder()
-				.url(url)
-				.head()
-				.build()
-			val response = okHttp.newCall(request).execute()
-			val type = response.body?.contentType()
-			return TestResponse(
-				code = response.code,
-				type = type?.type,
-				subtype = type?.subtype,
-			)
-		}
-	}
-}
diff --git a/app/src/test/java/org/koitharu/kotatsu/utils/TruthExt.kt b/app/src/test/java/org/koitharu/kotatsu/utils/TruthExt.kt
deleted file mode 100644
index 8e99bb1a9..000000000
--- a/app/src/test/java/org/koitharu/kotatsu/utils/TruthExt.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import com.google.common.truth.StringSubject
-import java.util.regex.Pattern
-
-private val PATTERN_URL_ABSOLUTE = Pattern.compile("https?://[^\\s]+", Pattern.CASE_INSENSITIVE)
-private val PATTERN_URL_RELATIVE = Pattern.compile("^/[^\\s]+", Pattern.CASE_INSENSITIVE)
-
-fun StringSubject.isRelativeUrl() = matches(PATTERN_URL_RELATIVE)
-
-fun StringSubject.isAbsoluteUrl() = matches(PATTERN_URL_ABSOLUTE)
-
-fun StringSubject.isNotAbsoluteUrl() = doesNotMatch(PATTERN_URL_ABSOLUTE)
\ No newline at end of file