diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index fcb9623a7..3e37c429f 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -25,51 +25,6 @@ jobs:
steps:
- name: Clone repo
uses: actions/checkout@v4
-
- build_multisrc:
- name: Build multisrc modules
- needs: prepare
- runs-on: arch
- steps:
- - name: Checkout master branch
- uses: actions/checkout@v4
-
- - name: Set up JDK
- uses: actions/setup-java@v3
- with:
- java-version: 17
- distribution: temurin
-
- - name: Prepare signing key
- run: |
- echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks
-
- - name: Generate sources from the multi-source library
- uses: gradle/gradle-build-action@v2
- env:
- CI_MODULE_GEN: "true"
- with:
- arguments: :multisrc:generateExtensions
-
- - name: Build extensions
- uses: gradle/gradle-build-action@v2
- env:
- CI_MULTISRC: "true"
- ALIAS: ${{ secrets.ALIAS }}
- KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
- KEY_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
- with:
- arguments: assembleRelease
-
- - name: Upload APKs
- uses: actions/upload-artifact@v3
- with:
- name: "multisrc-apks"
- path: "**/*.apk"
- retention-days: 1
-
- - name: Clean up CI files
- run: rm signingkey.jks
build_individual:
name: Build individual modules
@@ -92,7 +47,6 @@ jobs:
- name: Build extensions
uses: gradle/gradle-build-action@v2
env:
- CI_MULTISRC: "false"
ALIAS: ${{ secrets.ALIAS }}
KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
KEY_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -112,7 +66,6 @@ jobs:
publish_repo:
name: Publish repo
needs:
- - build_multisrc
- build_individual
runs-on: arch
steps:
diff --git a/.run/MadaraGenerator.run.xml b/.run/MadaraGenerator.run.xml
deleted file mode 100644
index 5934a39ce..000000000
--- a/.run/MadaraGenerator.run.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.run/MangaThemesiaGenerator.run.xml b/.run/MangaThemesiaGenerator.run.xml
deleted file mode 100644
index ed0bb0584..000000000
--- a/.run/MangaThemesiaGenerator.run.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/multisrc/overrides/a3manga/default/AndroidManifest.xml b/lib-multisrc/a3manga/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/a3manga/default/AndroidManifest.xml
rename to lib-multisrc/a3manga/AndroidManifest.xml
diff --git a/lib-multisrc/a3manga/build.gradle.kts b/lib-multisrc/a3manga/build.gradle.kts
new file mode 100644
index 000000000..e2f11e9c1
--- /dev/null
+++ b/lib-multisrc/a3manga/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 3
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/a3manga/A3Manga.kt b/lib-multisrc/a3manga/src/eu/kanade/tachiyomi/multisrc/a3manga/A3Manga.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/a3manga/A3Manga.kt
rename to lib-multisrc/a3manga/src/eu/kanade/tachiyomi/multisrc/a3manga/A3Manga.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/a3manga/A3MangaDto.kt b/lib-multisrc/a3manga/src/eu/kanade/tachiyomi/multisrc/a3manga/A3MangaDto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/a3manga/A3MangaDto.kt
rename to lib-multisrc/a3manga/src/eu/kanade/tachiyomi/multisrc/a3manga/A3MangaDto.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/a3manga/A3MangaUrlActivity.kt b/lib-multisrc/a3manga/src/eu/kanade/tachiyomi/multisrc/a3manga/A3MangaUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/a3manga/A3MangaUrlActivity.kt
rename to lib-multisrc/a3manga/src/eu/kanade/tachiyomi/multisrc/a3manga/A3MangaUrlActivity.kt
diff --git a/lib-multisrc/bakkin/build.gradle.kts b/lib-multisrc/bakkin/build.gradle.kts
new file mode 100644
index 000000000..ede652be5
--- /dev/null
+++ b/lib-multisrc/bakkin/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 6
diff --git a/multisrc/overrides/bakkin/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/bakkin/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bakkin/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/bakkin/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/bakkin/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/bakkin/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bakkin/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/bakkin/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/bakkin/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/bakkin/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bakkin/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/bakkin/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/bakkin/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/bakkin/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bakkin/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/bakkin/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/bakkin/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/bakkin/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bakkin/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/bakkin/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinJSON.kt b/lib-multisrc/bakkin/src/eu/kanade/tachiyomi/multisrc/bakkin/BakkinJSON.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinJSON.kt
rename to lib-multisrc/bakkin/src/eu/kanade/tachiyomi/multisrc/bakkin/BakkinJSON.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinReaderX.kt b/lib-multisrc/bakkin/src/eu/kanade/tachiyomi/multisrc/bakkin/BakkinReaderX.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinReaderX.kt
rename to lib-multisrc/bakkin/src/eu/kanade/tachiyomi/multisrc/bakkin/BakkinReaderX.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/README.md b/lib-multisrc/bilibili/README.md
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/README.md
rename to lib-multisrc/bilibili/README.md
diff --git a/lib-multisrc/bilibili/build.gradle.kts b/lib-multisrc/bilibili/build.gradle.kts
new file mode 100644
index 000000000..d1d9afd6e
--- /dev/null
+++ b/lib-multisrc/bilibili/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 9
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/Bilibili.kt b/lib-multisrc/bilibili/src/eu/kanade/tachiyomi/multisrc/bilibili/Bilibili.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/Bilibili.kt
rename to lib-multisrc/bilibili/src/eu/kanade/tachiyomi/multisrc/bilibili/Bilibili.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliDto.kt b/lib-multisrc/bilibili/src/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliDto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliDto.kt
rename to lib-multisrc/bilibili/src/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliDto.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliFilters.kt b/lib-multisrc/bilibili/src/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliFilters.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliFilters.kt
rename to lib-multisrc/bilibili/src/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliFilters.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliIntl.kt b/lib-multisrc/bilibili/src/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliIntl.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliIntl.kt
rename to lib-multisrc/bilibili/src/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliIntl.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliUrlActivity.kt b/lib-multisrc/bilibili/src/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliUrlActivity.kt
rename to lib-multisrc/bilibili/src/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliUrlActivity.kt
diff --git a/multisrc/overrides/blogtruyen/default/AndroidManifest.xml b/lib-multisrc/blogtruyen/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/blogtruyen/default/AndroidManifest.xml
rename to lib-multisrc/blogtruyen/AndroidManifest.xml
diff --git a/lib-multisrc/blogtruyen/build.gradle.kts b/lib-multisrc/blogtruyen/build.gradle.kts
new file mode 100644
index 000000000..dc076cc37
--- /dev/null
+++ b/lib-multisrc/blogtruyen/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyen.kt b/lib-multisrc/blogtruyen/src/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyen.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyen.kt
rename to lib-multisrc/blogtruyen/src/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyen.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyenUrlActivity.kt b/lib-multisrc/blogtruyen/src/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyenUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyenUrlActivity.kt
rename to lib-multisrc/blogtruyen/src/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyenUrlActivity.kt
diff --git a/multisrc/overrides/colamanga/default/AndroidManifest.xml b/lib-multisrc/colamanga/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/colamanga/default/AndroidManifest.xml
rename to lib-multisrc/colamanga/AndroidManifest.xml
diff --git a/multisrc/overrides/colamanga/default/additional.gradle b/lib-multisrc/colamanga/build.gradle.kts
similarity index 52%
rename from multisrc/overrides/colamanga/default/additional.gradle
rename to lib-multisrc/colamanga/build.gradle.kts
index 0ffbe4386..2deb98785 100644
--- a/multisrc/overrides/colamanga/default/additional.gradle
+++ b/lib-multisrc/colamanga/build.gradle.kts
@@ -1,3 +1,9 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 2
+
dependencies {
implementation(project(":lib:synchrony"))
}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaManga.kt b/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaManga.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaManga.kt
rename to lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaManga.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaFilters.kt b/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaFilters.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaFilters.kt
rename to lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaFilters.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaImageInterceptor.kt b/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaImageInterceptor.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaImageInterceptor.kt
rename to lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaImageInterceptor.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaIntl.kt b/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaIntl.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaIntl.kt
rename to lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaIntl.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaUrlActivity.kt b/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaUrlActivity.kt
rename to lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaUrlActivity.kt
diff --git a/lib-multisrc/colorlibanime/build.gradle.kts b/lib-multisrc/colorlibanime/build.gradle.kts
new file mode 100644
index 000000000..dc076cc37
--- /dev/null
+++ b/lib-multisrc/colorlibanime/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
diff --git a/multisrc/overrides/colorlibanime/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/colorlibanime/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/colorlibanime/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/colorlibanime/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/colorlibanime/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/colorlibanime/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/colorlibanime/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/colorlibanime/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/colorlibanime/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/colorlibanime/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/colorlibanime/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colorlibanime/ColorlibAnime.kt b/lib-multisrc/colorlibanime/src/eu/kanade/tachiyomi/multisrc/colorlibanime/ColorlibAnime.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colorlibanime/ColorlibAnime.kt
rename to lib-multisrc/colorlibanime/src/eu/kanade/tachiyomi/multisrc/colorlibanime/ColorlibAnime.kt
diff --git a/lib-multisrc/comicgamma/build.gradle.kts b/lib-multisrc/comicgamma/build.gradle.kts
new file mode 100644
index 000000000..ede652be5
--- /dev/null
+++ b/lib-multisrc/comicgamma/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 6
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGamma.kt b/lib-multisrc/comicgamma/src/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGamma.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGamma.kt
rename to lib-multisrc/comicgamma/src/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGamma.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicgamma/PtImg.kt b/lib-multisrc/comicgamma/src/eu/kanade/tachiyomi/multisrc/comicgamma/PtImg.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicgamma/PtImg.kt
rename to lib-multisrc/comicgamma/src/eu/kanade/tachiyomi/multisrc/comicgamma/PtImg.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicgamma/PtImgInterceptor.kt b/lib-multisrc/comicgamma/src/eu/kanade/tachiyomi/multisrc/comicgamma/PtImgInterceptor.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicgamma/PtImgInterceptor.kt
rename to lib-multisrc/comicgamma/src/eu/kanade/tachiyomi/multisrc/comicgamma/PtImgInterceptor.kt
diff --git a/lib-multisrc/eromuse/build.gradle.kts b/lib-multisrc/eromuse/build.gradle.kts
new file mode 100644
index 000000000..dc076cc37
--- /dev/null
+++ b/lib-multisrc/eromuse/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
diff --git a/multisrc/overrides/eromuse/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/eromuse/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/eromuse/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/eromuse/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/eromuse/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/eromuse/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/eromuse/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/eromuse/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/eromuse/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/eromuse/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/eromuse/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuse.kt b/lib-multisrc/eromuse/src/eu/kanade/tachiyomi/multisrc/eromuse/EroMuse.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuse.kt
rename to lib-multisrc/eromuse/src/eu/kanade/tachiyomi/multisrc/eromuse/EroMuse.kt
diff --git a/lib-multisrc/fansubscat/build.gradle.kts b/lib-multisrc/fansubscat/build.gradle.kts
new file mode 100644
index 000000000..6e70fd158
--- /dev/null
+++ b/lib-multisrc/fansubscat/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 4
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fansubscat/FansubsCat.kt b/lib-multisrc/fansubscat/src/eu/kanade/tachiyomi/multisrc/fansubscat/FansubsCat.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fansubscat/FansubsCat.kt
rename to lib-multisrc/fansubscat/src/eu/kanade/tachiyomi/multisrc/fansubscat/FansubsCat.kt
diff --git a/lib-multisrc/flixscans/build.gradle.kts b/lib-multisrc/flixscans/build.gradle.kts
new file mode 100644
index 000000000..b45873b53
--- /dev/null
+++ b/lib-multisrc/flixscans/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 5
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScans.kt b/lib-multisrc/flixscans/src/eu/kanade/tachiyomi/multisrc/flixscans/FlixScans.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScans.kt
rename to lib-multisrc/flixscans/src/eu/kanade/tachiyomi/multisrc/flixscans/FlixScans.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansDto.kt b/lib-multisrc/flixscans/src/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansDto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansDto.kt
rename to lib-multisrc/flixscans/src/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansDto.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenre.kt b/lib-multisrc/flixscans/src/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenre.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenre.kt
rename to lib-multisrc/flixscans/src/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenre.kt
diff --git a/lib-multisrc/fmreader/build.gradle.kts b/lib-multisrc/fmreader/build.gradle.kts
new file mode 100644
index 000000000..d1d9afd6e
--- /dev/null
+++ b/lib-multisrc/fmreader/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 9
diff --git a/multisrc/overrides/fmreader/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/fmreader/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/fmreader/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/fmreader/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/fmreader/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/fmreader/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/fmreader/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/fmreader/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/fmreader/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/fmreader/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/fmreader/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt b/lib-multisrc/fmreader/src/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt
rename to lib-multisrc/fmreader/src/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt
diff --git a/lib-multisrc/foolslide/build.gradle.kts b/lib-multisrc/foolslide/build.gradle.kts
new file mode 100644
index 000000000..e2f11e9c1
--- /dev/null
+++ b/lib-multisrc/foolslide/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 3
diff --git a/multisrc/overrides/foolslide/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/foolslide/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/foolslide/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/foolslide/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/foolslide/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/foolslide/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/foolslide/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/foolslide/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/foolslide/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/foolslide/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/foolslide/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt b/lib-multisrc/foolslide/src/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt
rename to lib-multisrc/foolslide/src/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt
diff --git a/lib-multisrc/gattsu/build.gradle.kts b/lib-multisrc/gattsu/build.gradle.kts
new file mode 100644
index 000000000..b45873b53
--- /dev/null
+++ b/lib-multisrc/gattsu/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 5
diff --git a/multisrc/overrides/gattsu/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/gattsu/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/gattsu/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/gattsu/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/gattsu/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/gattsu/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/gattsu/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/gattsu/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/gattsu/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/gattsu/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/gattsu/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gattsu/Gattsu.kt b/lib-multisrc/gattsu/src/eu/kanade/tachiyomi/multisrc/gattsu/Gattsu.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gattsu/Gattsu.kt
rename to lib-multisrc/gattsu/src/eu/kanade/tachiyomi/multisrc/gattsu/Gattsu.kt
diff --git a/lib-multisrc/gigaviewer/build.gradle.kts b/lib-multisrc/gigaviewer/build.gradle.kts
new file mode 100644
index 000000000..b45873b53
--- /dev/null
+++ b/lib-multisrc/gigaviewer/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 5
diff --git a/multisrc/overrides/gigaviewer/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/gigaviewer/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/gigaviewer/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/gigaviewer/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/gigaviewer/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/gigaviewer/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/gigaviewer/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/gigaviewer/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/gigaviewer/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/gigaviewer/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/gigaviewer/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewer.kt b/lib-multisrc/gigaviewer/src/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewer.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewer.kt
rename to lib-multisrc/gigaviewer/src/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewer.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewerDto.kt b/lib-multisrc/gigaviewer/src/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewerDto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewerDto.kt
rename to lib-multisrc/gigaviewer/src/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewerDto.kt
diff --git a/lib-multisrc/gravureblogger/build.gradle.kts b/lib-multisrc/gravureblogger/build.gradle.kts
new file mode 100644
index 000000000..dc076cc37
--- /dev/null
+++ b/lib-multisrc/gravureblogger/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gravureblogger/BloggerDto.kt b/lib-multisrc/gravureblogger/src/eu/kanade/tachiyomi/multisrc/gravureblogger/BloggerDto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gravureblogger/BloggerDto.kt
rename to lib-multisrc/gravureblogger/src/eu/kanade/tachiyomi/multisrc/gravureblogger/BloggerDto.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gravureblogger/GravureBlogger.kt b/lib-multisrc/gravureblogger/src/eu/kanade/tachiyomi/multisrc/gravureblogger/GravureBlogger.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gravureblogger/GravureBlogger.kt
rename to lib-multisrc/gravureblogger/src/eu/kanade/tachiyomi/multisrc/gravureblogger/GravureBlogger.kt
diff --git a/multisrc/overrides/grouple/default/AndroidManifest.xml b/lib-multisrc/grouple/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/grouple/default/AndroidManifest.xml
rename to lib-multisrc/grouple/AndroidManifest.xml
diff --git a/lib-multisrc/grouple/build.gradle.kts b/lib-multisrc/grouple/build.gradle.kts
new file mode 100644
index 000000000..58b20df9b
--- /dev/null
+++ b/lib-multisrc/grouple/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 22
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt b/lib-multisrc/grouple/src/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt
rename to lib-multisrc/grouple/src/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeUrlActivity.kt b/lib-multisrc/grouple/src/eu/kanade/tachiyomi/multisrc/grouple/GroupLeUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeUrlActivity.kt
rename to lib-multisrc/grouple/src/eu/kanade/tachiyomi/multisrc/grouple/GroupLeUrlActivity.kt
diff --git a/multisrc/overrides/guya/default/AndroidManifest.xml b/lib-multisrc/guya/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/guya/default/AndroidManifest.xml
rename to lib-multisrc/guya/AndroidManifest.xml
diff --git a/lib-multisrc/guya/build.gradle.kts b/lib-multisrc/guya/build.gradle.kts
new file mode 100644
index 000000000..b45873b53
--- /dev/null
+++ b/lib-multisrc/guya/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 5
diff --git a/multisrc/overrides/guya/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/guya/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/guya/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/guya/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/guya/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/guya/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/guya/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/guya/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/guya/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/guya/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/guya/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/Guya.kt b/lib-multisrc/guya/src/eu/kanade/tachiyomi/multisrc/guya/Guya.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/Guya.kt
rename to lib-multisrc/guya/src/eu/kanade/tachiyomi/multisrc/guya/Guya.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/GuyaUrlActivity.kt b/lib-multisrc/guya/src/eu/kanade/tachiyomi/multisrc/guya/GuyaUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/GuyaUrlActivity.kt
rename to lib-multisrc/guya/src/eu/kanade/tachiyomi/multisrc/guya/GuyaUrlActivity.kt
diff --git a/multisrc/overrides/heancms/default/AndroidManifest.xml b/lib-multisrc/heancms/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/heancms/default/AndroidManifest.xml
rename to lib-multisrc/heancms/AndroidManifest.xml
diff --git a/lib-multisrc/heancms/build.gradle.kts b/lib-multisrc/heancms/build.gradle.kts
new file mode 100644
index 000000000..b105a49df
--- /dev/null
+++ b/lib-multisrc/heancms/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 20
diff --git a/multisrc/overrides/heancms/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/heancms/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/heancms/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/heancms/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/heancms/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/heancms/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/heancms/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/heancms/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/heancms/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/heancms/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/heancms/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCms.kt b/lib-multisrc/heancms/src/eu/kanade/tachiyomi/multisrc/heancms/HeanCms.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCms.kt
rename to lib-multisrc/heancms/src/eu/kanade/tachiyomi/multisrc/heancms/HeanCms.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsDto.kt b/lib-multisrc/heancms/src/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsDto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsDto.kt
rename to lib-multisrc/heancms/src/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsDto.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsFilters.kt b/lib-multisrc/heancms/src/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsFilters.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsFilters.kt
rename to lib-multisrc/heancms/src/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsFilters.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsIntl.kt b/lib-multisrc/heancms/src/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsIntl.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsIntl.kt
rename to lib-multisrc/heancms/src/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsIntl.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsUrlActivity.kt b/lib-multisrc/heancms/src/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsUrlActivity.kt
rename to lib-multisrc/heancms/src/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsUrlActivity.kt
diff --git a/lib-multisrc/hentaihand/build.gradle.kts b/lib-multisrc/hentaihand/build.gradle.kts
new file mode 100644
index 000000000..9dce2478c
--- /dev/null
+++ b/lib-multisrc/hentaihand/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 2
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/hentaihand/HentaiHand.kt b/lib-multisrc/hentaihand/src/eu/kanade/tachiyomi/multisrc/hentaihand/HentaiHand.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/hentaihand/HentaiHand.kt
rename to lib-multisrc/hentaihand/src/eu/kanade/tachiyomi/multisrc/hentaihand/HentaiHand.kt
diff --git a/lib-multisrc/kemono/build.gradle.kts b/lib-multisrc/kemono/build.gradle.kts
new file mode 100644
index 000000000..8047e9e33
--- /dev/null
+++ b/lib-multisrc/kemono/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 10
diff --git a/multisrc/overrides/kemono/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/kemono/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/kemono/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/kemono/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/kemono/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/kemono/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/kemono/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/kemono/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/kemono/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/kemono/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/kemono/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/kemono/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/kemono/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/kemono/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/kemono/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/kemono/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/kemono/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/kemono/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/kemono/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/kemono/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt b/lib-multisrc/kemono/src/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt
rename to lib-multisrc/kemono/src/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/KemonoDto.kt b/lib-multisrc/kemono/src/eu/kanade/tachiyomi/multisrc/kemono/KemonoDto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/KemonoDto.kt
rename to lib-multisrc/kemono/src/eu/kanade/tachiyomi/multisrc/kemono/KemonoDto.kt
diff --git a/multisrc/overrides/lectortmo/default/AndroidManifest.xml b/lib-multisrc/lectortmo/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/lectortmo/default/AndroidManifest.xml
rename to lib-multisrc/lectortmo/AndroidManifest.xml
diff --git a/lib-multisrc/lectortmo/build.gradle.kts b/lib-multisrc/lectortmo/build.gradle.kts
new file mode 100644
index 000000000..e2f11e9c1
--- /dev/null
+++ b/lib-multisrc/lectortmo/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 3
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmo.kt b/lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmo.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmo.kt
rename to lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmo.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoFilters.kt b/lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoFilters.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoFilters.kt
rename to lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoFilters.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoUrlActivity.kt b/lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoUrlActivity.kt
rename to lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoUrlActivity.kt
diff --git a/lib-multisrc/libgroup/build.gradle.kts b/lib-multisrc/libgroup/build.gradle.kts
new file mode 100644
index 000000000..f24e51157
--- /dev/null
+++ b/lib-multisrc/libgroup/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 25
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt b/lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt
rename to lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibUrlActivity.kt b/lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibUrlActivity.kt
rename to lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibUrlActivity.kt
diff --git a/lib-multisrc/likemanga/build.gradle.kts b/lib-multisrc/likemanga/build.gradle.kts
new file mode 100644
index 000000000..dc076cc37
--- /dev/null
+++ b/lib-multisrc/likemanga/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/likemanga/LikeManga.kt b/lib-multisrc/likemanga/src/eu/kanade/tachiyomi/multisrc/likemanga/LikeManga.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/likemanga/LikeManga.kt
rename to lib-multisrc/likemanga/src/eu/kanade/tachiyomi/multisrc/likemanga/LikeManga.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/likemanga/LikeMangaFilters.kt b/lib-multisrc/likemanga/src/eu/kanade/tachiyomi/multisrc/likemanga/LikeMangaFilters.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/likemanga/LikeMangaFilters.kt
rename to lib-multisrc/likemanga/src/eu/kanade/tachiyomi/multisrc/likemanga/LikeMangaFilters.kt
diff --git a/multisrc/overrides/madara/default/AndroidManifest.xml b/lib-multisrc/madara/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/madara/default/AndroidManifest.xml
rename to lib-multisrc/madara/AndroidManifest.xml
diff --git a/multisrc/overrides/madara/default/additional.gradle b/lib-multisrc/madara/build.gradle.kts
similarity index 65%
rename from multisrc/overrides/madara/default/additional.gradle
rename to lib-multisrc/madara/build.gradle.kts
index 48c2499a0..483534f15 100644
--- a/multisrc/overrides/madara/default/additional.gradle
+++ b/lib-multisrc/madara/build.gradle.kts
@@ -1,3 +1,9 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 33
+
dependencies {
implementation(project(":lib:cryptoaes"))
implementation(project(":lib:randomua"))
diff --git a/multisrc/overrides/madara/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/madara/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/madara/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/madara/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/madara/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/madara/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/madara/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/madara/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/madara/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/madara/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/madara/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt b/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
rename to lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraUrlActivity.kt b/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/MadaraUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraUrlActivity.kt
rename to lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/MadaraUrlActivity.kt
diff --git a/lib-multisrc/madtheme/build.gradle.kts b/lib-multisrc/madtheme/build.gradle.kts
new file mode 100644
index 000000000..f5a077b4b
--- /dev/null
+++ b/lib-multisrc/madtheme/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 13
diff --git a/multisrc/overrides/madtheme/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/madtheme/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/madtheme/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/madtheme/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/madtheme/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/madtheme/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/madtheme/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/madtheme/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/madtheme/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/madtheme/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/madtheme/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madtheme/MadTheme.kt b/lib-multisrc/madtheme/src/eu/kanade/tachiyomi/multisrc/madtheme/MadTheme.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madtheme/MadTheme.kt
rename to lib-multisrc/madtheme/src/eu/kanade/tachiyomi/multisrc/madtheme/MadTheme.kt
diff --git a/lib-multisrc/makaru/build.gradle.kts b/lib-multisrc/makaru/build.gradle.kts
new file mode 100644
index 000000000..dc076cc37
--- /dev/null
+++ b/lib-multisrc/makaru/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/makaru/Makaru.kt b/lib-multisrc/makaru/src/eu/kanade/tachiyomi/multisrc/makaru/Makaru.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/makaru/Makaru.kt
rename to lib-multisrc/makaru/src/eu/kanade/tachiyomi/multisrc/makaru/Makaru.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/makaru/MakaruDto.kt b/lib-multisrc/makaru/src/eu/kanade/tachiyomi/multisrc/makaru/MakaruDto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/makaru/MakaruDto.kt
rename to lib-multisrc/makaru/src/eu/kanade/tachiyomi/multisrc/makaru/MakaruDto.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/makaru/MakaruFilters.kt b/lib-multisrc/makaru/src/eu/kanade/tachiyomi/multisrc/makaru/MakaruFilters.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/makaru/MakaruFilters.kt
rename to lib-multisrc/makaru/src/eu/kanade/tachiyomi/multisrc/makaru/MakaruFilters.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/makaru/MakaruUtils.kt b/lib-multisrc/makaru/src/eu/kanade/tachiyomi/multisrc/makaru/MakaruUtils.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/makaru/MakaruUtils.kt
rename to lib-multisrc/makaru/src/eu/kanade/tachiyomi/multisrc/makaru/MakaruUtils.kt
diff --git a/lib-multisrc/manga18/build.gradle.kts b/lib-multisrc/manga18/build.gradle.kts
new file mode 100644
index 000000000..dc076cc37
--- /dev/null
+++ b/lib-multisrc/manga18/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
diff --git a/multisrc/overrides/manga18/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/manga18/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/manga18/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/manga18/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/manga18/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/manga18/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/manga18/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/manga18/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/manga18/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/manga18/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/manga18/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/manga18/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/manga18/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/manga18/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/manga18/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/manga18/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/manga18/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/manga18/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/manga18/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/manga18/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/manga18/Manga18.kt b/lib-multisrc/manga18/src/eu/kanade/tachiyomi/multisrc/manga18/Manga18.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/manga18/Manga18.kt
rename to lib-multisrc/manga18/src/eu/kanade/tachiyomi/multisrc/manga18/Manga18.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/manga18/Manga18Filters.kt b/lib-multisrc/manga18/src/eu/kanade/tachiyomi/multisrc/manga18/Manga18Filters.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/manga18/Manga18Filters.kt
rename to lib-multisrc/manga18/src/eu/kanade/tachiyomi/multisrc/manga18/Manga18Filters.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/README.md b/lib-multisrc/mangabox/README.md
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/README.md
rename to lib-multisrc/mangabox/README.md
diff --git a/lib-multisrc/mangabox/build.gradle.kts b/lib-multisrc/mangabox/build.gradle.kts
new file mode 100644
index 000000000..b45873b53
--- /dev/null
+++ b/lib-multisrc/mangabox/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 5
diff --git a/multisrc/overrides/mangabox/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/mangabox/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/mangabox/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/mangabox/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/mangabox/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/mangabox/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/mangabox/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/mangabox/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/mangabox/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/mangabox/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/mangabox/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt b/lib-multisrc/mangabox/src/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt
rename to lib-multisrc/mangabox/src/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt
diff --git a/lib-multisrc/mangacatalog/build.gradle.kts b/lib-multisrc/mangacatalog/build.gradle.kts
new file mode 100644
index 000000000..6e70fd158
--- /dev/null
+++ b/lib-multisrc/mangacatalog/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 4
diff --git a/multisrc/overrides/mangacatalog/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/mangacatalog/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/mangacatalog/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/mangacatalog/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/mangacatalog/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/mangacatalog/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/mangacatalog/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/mangacatalog/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/mangacatalog/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/mangacatalog/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/mangacatalog/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalog.kt b/lib-multisrc/mangacatalog/src/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalog.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalog.kt
rename to lib-multisrc/mangacatalog/src/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalog.kt
diff --git a/multisrc/overrides/mangadventure/default/AndroidManifest.xml b/lib-multisrc/mangadventure/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/mangadventure/default/AndroidManifest.xml
rename to lib-multisrc/mangadventure/AndroidManifest.xml
diff --git a/lib-multisrc/mangadventure/build.gradle.kts b/lib-multisrc/mangadventure/build.gradle.kts
new file mode 100644
index 000000000..f5a077b4b
--- /dev/null
+++ b/lib-multisrc/mangadventure/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 13
diff --git a/multisrc/overrides/mangadventure/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/mangadventure/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/mangadventure/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/mangadventure/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/mangadventure/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/mangadventure/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/mangadventure/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/mangadventure/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/mangadventure/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/mangadventure/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/mangadventure/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventure.kt b/lib-multisrc/mangadventure/src/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventure.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventure.kt
rename to lib-multisrc/mangadventure/src/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventure.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureAPI.kt b/lib-multisrc/mangadventure/src/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureAPI.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureAPI.kt
rename to lib-multisrc/mangadventure/src/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureAPI.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureActivity.kt b/lib-multisrc/mangadventure/src/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureActivity.kt
rename to lib-multisrc/mangadventure/src/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureActivity.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureFilters.kt b/lib-multisrc/mangadventure/src/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureFilters.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureFilters.kt
rename to lib-multisrc/mangadventure/src/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureFilters.kt
diff --git a/multisrc/overrides/mangathemesia/default/additional.gradle b/lib-multisrc/mangahub/build.gradle.kts
similarity index 51%
rename from multisrc/overrides/mangathemesia/default/additional.gradle
rename to lib-multisrc/mangahub/build.gradle.kts
index 4020fe0a8..751dab27f 100644
--- a/multisrc/overrides/mangathemesia/default/additional.gradle
+++ b/lib-multisrc/mangahub/build.gradle.kts
@@ -1,3 +1,9 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 27
+
dependencies {
implementation(project(":lib:randomua"))
}
diff --git a/multisrc/overrides/mangahub/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/mangahub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/mangahub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/mangahub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/mangahub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/mangahub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/mangahub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/mangahub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/mangahub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/mangahub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/mangahub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangahub/MangaHub.kt b/lib-multisrc/mangahub/src/eu/kanade/tachiyomi/multisrc/mangahub/MangaHub.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangahub/MangaHub.kt
rename to lib-multisrc/mangahub/src/eu/kanade/tachiyomi/multisrc/mangahub/MangaHub.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangahub/MangaHubQueries.kt b/lib-multisrc/mangahub/src/eu/kanade/tachiyomi/multisrc/mangahub/MangaHubQueries.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangahub/MangaHubQueries.kt
rename to lib-multisrc/mangahub/src/eu/kanade/tachiyomi/multisrc/mangahub/MangaHubQueries.kt
diff --git a/lib-multisrc/mangaraw/build.gradle.kts b/lib-multisrc/mangaraw/build.gradle.kts
new file mode 100644
index 000000000..b45873b53
--- /dev/null
+++ b/lib-multisrc/mangaraw/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 5
diff --git a/multisrc/overrides/mangaraw/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/mangaraw/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaraw/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/mangaraw/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaraw/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/mangaraw/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaraw/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/mangaraw/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaraw/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/mangaraw/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaraw/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/mangaraw/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaraw/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/mangaraw/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaraw/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/mangaraw/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaraw/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/mangaraw/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaraw/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/mangaraw/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangaraw/ImageListParser.kt b/lib-multisrc/mangaraw/src/eu/kanade/tachiyomi/multisrc/mangaraw/ImageListParser.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangaraw/ImageListParser.kt
rename to lib-multisrc/mangaraw/src/eu/kanade/tachiyomi/multisrc/mangaraw/ImageListParser.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangaraw/MangaRawTheme.kt b/lib-multisrc/mangaraw/src/eu/kanade/tachiyomi/multisrc/mangaraw/MangaRawTheme.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangaraw/MangaRawTheme.kt
rename to lib-multisrc/mangaraw/src/eu/kanade/tachiyomi/multisrc/mangaraw/MangaRawTheme.kt
diff --git a/lib-multisrc/mangareader/build.gradle.kts b/lib-multisrc/mangareader/build.gradle.kts
new file mode 100644
index 000000000..dc076cc37
--- /dev/null
+++ b/lib-multisrc/mangareader/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangareader/MangaReader.kt b/lib-multisrc/mangareader/src/eu/kanade/tachiyomi/multisrc/mangareader/MangaReader.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangareader/MangaReader.kt
rename to lib-multisrc/mangareader/src/eu/kanade/tachiyomi/multisrc/mangareader/MangaReader.kt
diff --git a/multisrc/overrides/mangathemesia/default/AndroidManifest.xml b/lib-multisrc/mangathemesia/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/mangathemesia/default/AndroidManifest.xml
rename to lib-multisrc/mangathemesia/AndroidManifest.xml
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/README.md b/lib-multisrc/mangathemesia/README.md
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/README.md
rename to lib-multisrc/mangathemesia/README.md
diff --git a/multisrc/overrides/mangahub/default/additional.gradle b/lib-multisrc/mangathemesia/build.gradle.kts
similarity index 51%
rename from multisrc/overrides/mangahub/default/additional.gradle
rename to lib-multisrc/mangathemesia/build.gradle.kts
index 4020fe0a8..81a383089 100644
--- a/multisrc/overrides/mangahub/default/additional.gradle
+++ b/lib-multisrc/mangathemesia/build.gradle.kts
@@ -1,3 +1,9 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 28
+
dependencies {
implementation(project(":lib:randomua"))
}
diff --git a/multisrc/overrides/mangathemesia/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/mangathemesia/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/mangathemesia/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/mangathemesia/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/mangathemesia/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/mangathemesia/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/mangathemesia/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/mangathemesia/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/mangathemesia/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/mangathemesia/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/mangathemesia/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesia.kt b/lib-multisrc/mangathemesia/src/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesia.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesia.kt
rename to lib-multisrc/mangathemesia/src/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesia.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaUrlActivity.kt b/lib-multisrc/mangathemesia/src/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaUrlActivity.kt
rename to lib-multisrc/mangathemesia/src/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaUrlActivity.kt
diff --git a/lib-multisrc/mangaworld/build.gradle.kts b/lib-multisrc/mangaworld/build.gradle.kts
new file mode 100644
index 000000000..9dce2478c
--- /dev/null
+++ b/lib-multisrc/mangaworld/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 2
diff --git a/multisrc/overrides/mangaworld/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/mangaworld/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaworld/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/mangaworld/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaworld/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/mangaworld/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaworld/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/mangaworld/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaworld/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/mangaworld/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaworld/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/mangaworld/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaworld/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/mangaworld/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaworld/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/mangaworld/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaworld/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/mangaworld/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaworld/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/mangaworld/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangaworld/MangaWorld.kt b/lib-multisrc/mangaworld/src/eu/kanade/tachiyomi/multisrc/mangaworld/MangaWorld.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangaworld/MangaWorld.kt
rename to lib-multisrc/mangaworld/src/eu/kanade/tachiyomi/multisrc/mangaworld/MangaWorld.kt
diff --git a/lib-multisrc/masonry/build.gradle.kts b/lib-multisrc/masonry/build.gradle.kts
new file mode 100644
index 000000000..dc076cc37
--- /dev/null
+++ b/lib-multisrc/masonry/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/masonry/Masonry.kt b/lib-multisrc/masonry/src/eu/kanade/tachiyomi/multisrc/masonry/Masonry.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/masonry/Masonry.kt
rename to lib-multisrc/masonry/src/eu/kanade/tachiyomi/multisrc/masonry/Masonry.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/masonry/MasonryFilters.kt b/lib-multisrc/masonry/src/eu/kanade/tachiyomi/multisrc/masonry/MasonryFilters.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/masonry/MasonryFilters.kt
rename to lib-multisrc/masonry/src/eu/kanade/tachiyomi/multisrc/masonry/MasonryFilters.kt
diff --git a/lib-multisrc/mccms/build.gradle.kts b/lib-multisrc/mccms/build.gradle.kts
new file mode 100644
index 000000000..ede652be5
--- /dev/null
+++ b/lib-multisrc/mccms/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 6
diff --git a/multisrc/overrides/mccms/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/mccms/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/mccms/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/mccms/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/mccms/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/mccms/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/mccms/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/mccms/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/mccms/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/mccms/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/mccms/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMS.kt b/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMS.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMS.kt
rename to lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMS.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMSConfig.kt b/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSConfig.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMSConfig.kt
rename to lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSConfig.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMSDto.kt b/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSDto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMSDto.kt
rename to lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSDto.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMSFilters.kt b/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSFilters.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMSFilters.kt
rename to lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSFilters.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMSWeb.kt b/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSWeb.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMSWeb.kt
rename to lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSWeb.kt
diff --git a/lib-multisrc/mmrcms/build.gradle.kts b/lib-multisrc/mmrcms/build.gradle.kts
new file mode 100644
index 000000000..d1d9afd6e
--- /dev/null
+++ b/lib-multisrc/mmrcms/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 9
diff --git a/multisrc/overrides/mmrcms/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/mmrcms/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/mmrcms/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/mmrcms/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/mmrcms/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/mmrcms/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/mmrcms/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/mmrcms/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/mmrcms/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/mmrcms/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/mmrcms/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/Forbidden.kt b/lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/Forbidden.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/Forbidden.kt
rename to lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/Forbidden.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMS.kt b/lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMS.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMS.kt
rename to lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMS.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSDto.kt b/lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSDto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSDto.kt
rename to lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSDto.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSFilters.kt b/lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSFilters.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSFilters.kt
rename to lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSFilters.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSUtils.kt b/lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSUtils.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSUtils.kt
rename to lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSUtils.kt
diff --git a/lib-multisrc/monochrome/build.gradle.kts b/lib-multisrc/monochrome/build.gradle.kts
new file mode 100644
index 000000000..6e70fd158
--- /dev/null
+++ b/lib-multisrc/monochrome/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 4
diff --git a/multisrc/overrides/monochrome/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/monochrome/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/monochrome/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/monochrome/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/monochrome/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/monochrome/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/monochrome/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/monochrome/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/monochrome/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/monochrome/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/monochrome/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/monochrome/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/monochrome/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/monochrome/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/monochrome/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/monochrome/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/monochrome/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/monochrome/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/monochrome/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/monochrome/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeAPI.kt b/lib-multisrc/monochrome/src/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeAPI.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeAPI.kt
rename to lib-multisrc/monochrome/src/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeAPI.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeActivity.kt b/lib-multisrc/monochrome/src/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeActivity.kt
rename to lib-multisrc/monochrome/src/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeActivity.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeCMS.kt b/lib-multisrc/monochrome/src/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeCMS.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeCMS.kt
rename to lib-multisrc/monochrome/src/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeCMS.kt
diff --git a/lib-multisrc/multichan/build.gradle.kts b/lib-multisrc/multichan/build.gradle.kts
new file mode 100644
index 000000000..e2f11e9c1
--- /dev/null
+++ b/lib-multisrc/multichan/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 3
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt b/lib-multisrc/multichan/src/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt
rename to lib-multisrc/multichan/src/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt
diff --git a/multisrc/overrides/mymangacms/default/AndroidManifest.xml b/lib-multisrc/mymangacms/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/mymangacms/default/AndroidManifest.xml
rename to lib-multisrc/mymangacms/AndroidManifest.xml
diff --git a/lib-multisrc/mymangacms/build.gradle.kts b/lib-multisrc/mymangacms/build.gradle.kts
new file mode 100644
index 000000000..9dce2478c
--- /dev/null
+++ b/lib-multisrc/mymangacms/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 2
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMS.kt b/lib-multisrc/mymangacms/src/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMS.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMS.kt
rename to lib-multisrc/mymangacms/src/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMS.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMSUrlActivity.kt b/lib-multisrc/mymangacms/src/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMSUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMSUrlActivity.kt
rename to lib-multisrc/mymangacms/src/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMSUrlActivity.kt
diff --git a/lib-multisrc/nepnep/build.gradle.kts b/lib-multisrc/nepnep/build.gradle.kts
new file mode 100644
index 000000000..01917c6f3
--- /dev/null
+++ b/lib-multisrc/nepnep/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 12
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt b/lib-multisrc/nepnep/src/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt
rename to lib-multisrc/nepnep/src/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt
diff --git a/lib-multisrc/otakusanctuary/build.gradle.kts b/lib-multisrc/otakusanctuary/build.gradle.kts
new file mode 100644
index 000000000..6e70fd158
--- /dev/null
+++ b/lib-multisrc/otakusanctuary/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 4
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/otakusanctuary/OtakuSanctuary.kt b/lib-multisrc/otakusanctuary/src/eu/kanade/tachiyomi/multisrc/otakusanctuary/OtakuSanctuary.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/otakusanctuary/OtakuSanctuary.kt
rename to lib-multisrc/otakusanctuary/src/eu/kanade/tachiyomi/multisrc/otakusanctuary/OtakuSanctuary.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/otakusanctuary/OtakuSanctuaryHelper.kt b/lib-multisrc/otakusanctuary/src/eu/kanade/tachiyomi/multisrc/otakusanctuary/OtakuSanctuaryHelper.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/otakusanctuary/OtakuSanctuaryHelper.kt
rename to lib-multisrc/otakusanctuary/src/eu/kanade/tachiyomi/multisrc/otakusanctuary/OtakuSanctuaryHelper.kt
diff --git a/lib-multisrc/paprika/build.gradle.kts b/lib-multisrc/paprika/build.gradle.kts
new file mode 100644
index 000000000..dc076cc37
--- /dev/null
+++ b/lib-multisrc/paprika/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
diff --git a/multisrc/overrides/paprika/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/paprika/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/paprika/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/paprika/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/paprika/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/paprika/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/paprika/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/paprika/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/paprika/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/paprika/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/paprika/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/paprika/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/paprika/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/paprika/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/paprika/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/Paprika.kt b/lib-multisrc/paprika/src/eu/kanade/tachiyomi/multisrc/paprika/Paprika.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/Paprika.kt
rename to lib-multisrc/paprika/src/eu/kanade/tachiyomi/multisrc/paprika/Paprika.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAlt.kt b/lib-multisrc/paprika/src/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAlt.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAlt.kt
rename to lib-multisrc/paprika/src/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAlt.kt
diff --git a/multisrc/overrides/peachscan/default/additional.gradle b/lib-multisrc/peachscan/build.gradle.kts
similarity index 76%
rename from multisrc/overrides/peachscan/default/additional.gradle
rename to lib-multisrc/peachscan/build.gradle.kts
index da7c190c3..f4fd3a73d 100644
--- a/multisrc/overrides/peachscan/default/additional.gradle
+++ b/lib-multisrc/peachscan/build.gradle.kts
@@ -1,3 +1,9 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 2
+
dependencies {
// Only PeachScan sources uses the image-decoder dependency.
//noinspection UseTomlInstead
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/peachscan/PeachScan.kt b/lib-multisrc/peachscan/src/eu/kanade/tachiyomi/multisrc/peachscan/PeachScan.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/peachscan/PeachScan.kt
rename to lib-multisrc/peachscan/src/eu/kanade/tachiyomi/multisrc/peachscan/PeachScan.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/peachscan/PeachScanUtils.kt b/lib-multisrc/peachscan/src/eu/kanade/tachiyomi/multisrc/peachscan/PeachScanUtils.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/peachscan/PeachScanUtils.kt
rename to lib-multisrc/peachscan/src/eu/kanade/tachiyomi/multisrc/peachscan/PeachScanUtils.kt
diff --git a/lib-multisrc/pizzareader/build.gradle.kts b/lib-multisrc/pizzareader/build.gradle.kts
new file mode 100644
index 000000000..9dce2478c
--- /dev/null
+++ b/lib-multisrc/pizzareader/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 2
diff --git a/multisrc/overrides/pizzareader/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/pizzareader/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/pizzareader/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/pizzareader/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/pizzareader/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/pizzareader/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/pizzareader/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/pizzareader/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/pizzareader/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/pizzareader/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/pizzareader/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReader.kt b/lib-multisrc/pizzareader/src/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReader.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReader.kt
rename to lib-multisrc/pizzareader/src/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReader.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReaderDto.kt b/lib-multisrc/pizzareader/src/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReaderDto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReaderDto.kt
rename to lib-multisrc/pizzareader/src/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReaderDto.kt
diff --git a/multisrc/overrides/po2scans/default/AndroidManifest.xml b/lib-multisrc/po2scans/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/po2scans/default/AndroidManifest.xml
rename to lib-multisrc/po2scans/AndroidManifest.xml
diff --git a/multisrc/overrides/po2scans/default/additional.gradle b/lib-multisrc/po2scans/build.gradle.kts
similarity index 52%
rename from multisrc/overrides/po2scans/default/additional.gradle
rename to lib-multisrc/po2scans/build.gradle.kts
index 081900adc..5734b0831 100644
--- a/multisrc/overrides/po2scans/default/additional.gradle
+++ b/lib-multisrc/po2scans/build.gradle.kts
@@ -1,3 +1,9 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
+
dependencies {
implementation(project(":lib:dataimage"))
}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/po2scans/PO2Scans.kt b/lib-multisrc/po2scans/src/eu/kanade/tachiyomi/multisrc/po2scans/PO2Scans.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/po2scans/PO2Scans.kt
rename to lib-multisrc/po2scans/src/eu/kanade/tachiyomi/multisrc/po2scans/PO2Scans.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/po2scans/PO2ScansUrlActivity.kt b/lib-multisrc/po2scans/src/eu/kanade/tachiyomi/multisrc/po2scans/PO2ScansUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/po2scans/PO2ScansUrlActivity.kt
rename to lib-multisrc/po2scans/src/eu/kanade/tachiyomi/multisrc/po2scans/PO2ScansUrlActivity.kt
diff --git a/lib-multisrc/readallcomics/build.gradle.kts b/lib-multisrc/readallcomics/build.gradle.kts
new file mode 100644
index 000000000..dc076cc37
--- /dev/null
+++ b/lib-multisrc/readallcomics/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
diff --git a/multisrc/overrides/readallcomics/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/readallcomics/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/readallcomics/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/readallcomics/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/readallcomics/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/readallcomics/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/readallcomics/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/readallcomics/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/readallcomics/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/readallcomics/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/readallcomics/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readallcomics/ReadAllComics.kt b/lib-multisrc/readallcomics/src/eu/kanade/tachiyomi/multisrc/readallcomics/ReadAllComics.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readallcomics/ReadAllComics.kt
rename to lib-multisrc/readallcomics/src/eu/kanade/tachiyomi/multisrc/readallcomics/ReadAllComics.kt
diff --git a/multisrc/overrides/readerfront/default/AndroidManifest.xml b/lib-multisrc/readerfront/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/readerfront/default/AndroidManifest.xml
rename to lib-multisrc/readerfront/AndroidManifest.xml
diff --git a/lib-multisrc/readerfront/build.gradle.kts b/lib-multisrc/readerfront/build.gradle.kts
new file mode 100644
index 000000000..6b8a110f9
--- /dev/null
+++ b/lib-multisrc/readerfront/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 8
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFront.kt b/lib-multisrc/readerfront/src/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFront.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFront.kt
rename to lib-multisrc/readerfront/src/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFront.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontAPI.kt b/lib-multisrc/readerfront/src/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontAPI.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontAPI.kt
rename to lib-multisrc/readerfront/src/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontAPI.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontActivity.kt b/lib-multisrc/readerfront/src/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontActivity.kt
rename to lib-multisrc/readerfront/src/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontActivity.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontI18N.kt b/lib-multisrc/readerfront/src/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontI18N.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontI18N.kt
rename to lib-multisrc/readerfront/src/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontI18N.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontQueries.kt b/lib-multisrc/readerfront/src/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontQueries.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontQueries.kt
rename to lib-multisrc/readerfront/src/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontQueries.kt
diff --git a/lib-multisrc/senkuro/build.gradle.kts b/lib-multisrc/senkuro/build.gradle.kts
new file mode 100644
index 000000000..9dce2478c
--- /dev/null
+++ b/lib-multisrc/senkuro/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 2
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/senkuro/Dto.kt b/lib-multisrc/senkuro/src/eu/kanade/tachiyomi/multisrc/senkuro/Dto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/senkuro/Dto.kt
rename to lib-multisrc/senkuro/src/eu/kanade/tachiyomi/multisrc/senkuro/Dto.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/senkuro/Senkuro.kt b/lib-multisrc/senkuro/src/eu/kanade/tachiyomi/multisrc/senkuro/Senkuro.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/senkuro/Senkuro.kt
rename to lib-multisrc/senkuro/src/eu/kanade/tachiyomi/multisrc/senkuro/Senkuro.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/senkuro/SenkuroQueries.kt b/lib-multisrc/senkuro/src/eu/kanade/tachiyomi/multisrc/senkuro/SenkuroQueries.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/senkuro/SenkuroQueries.kt
rename to lib-multisrc/senkuro/src/eu/kanade/tachiyomi/multisrc/senkuro/SenkuroQueries.kt
diff --git a/lib-multisrc/sinmh/build.gradle.kts b/lib-multisrc/sinmh/build.gradle.kts
new file mode 100644
index 000000000..7813c7ee1
--- /dev/null
+++ b/lib-multisrc/sinmh/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 11
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/ProgressiveParser.kt b/lib-multisrc/sinmh/src/eu/kanade/tachiyomi/multisrc/sinmh/ProgressiveParser.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/ProgressiveParser.kt
rename to lib-multisrc/sinmh/src/eu/kanade/tachiyomi/multisrc/sinmh/ProgressiveParser.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt b/lib-multisrc/sinmh/src/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt
rename to lib-multisrc/sinmh/src/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt
diff --git a/lib-multisrc/webtoons/build.gradle.kts b/lib-multisrc/webtoons/build.gradle.kts
new file mode 100644
index 000000000..9dce2478c
--- /dev/null
+++ b/lib-multisrc/webtoons/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 2
diff --git a/multisrc/overrides/webtoons/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/webtoons/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/webtoons/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/webtoons/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/webtoons/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/webtoons/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/webtoons/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/webtoons/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/webtoons/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/webtoons/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/webtoons/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/webtoons/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/webtoons/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/webtoons/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/webtoons/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/webtoons/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/webtoons/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/webtoons/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/webtoons/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/webtoons/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt b/lib-multisrc/webtoons/src/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt
rename to lib-multisrc/webtoons/src/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslate.kt b/lib-multisrc/webtoons/src/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslate.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslate.kt
rename to lib-multisrc/webtoons/src/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslate.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsUrlActivity.kt b/lib-multisrc/webtoons/src/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsUrlActivity.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsUrlActivity.kt
rename to lib-multisrc/webtoons/src/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsUrlActivity.kt
diff --git a/lib-multisrc/wpcomics/build.gradle.kts b/lib-multisrc/wpcomics/build.gradle.kts
new file mode 100644
index 000000000..6e70fd158
--- /dev/null
+++ b/lib-multisrc/wpcomics/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 4
diff --git a/multisrc/overrides/wpcomics/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/wpcomics/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/wpcomics/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/wpcomics/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/wpcomics/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/wpcomics/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/wpcomics/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/wpcomics/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/wpcomics/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/wpcomics/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/wpcomics/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComics.kt b/lib-multisrc/wpcomics/src/eu/kanade/tachiyomi/multisrc/wpcomics/WPComics.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComics.kt
rename to lib-multisrc/wpcomics/src/eu/kanade/tachiyomi/multisrc/wpcomics/WPComics.kt
diff --git a/lib-multisrc/zbulu/build.gradle.kts b/lib-multisrc/zbulu/build.gradle.kts
new file mode 100644
index 000000000..ede652be5
--- /dev/null
+++ b/lib-multisrc/zbulu/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 6
diff --git a/multisrc/overrides/zbulu/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/zbulu/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/zbulu/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zbulu/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/zbulu/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/zbulu/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zbulu/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/zbulu/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/zbulu/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zbulu/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/zbulu/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/zbulu/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zbulu/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/zbulu/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/zbulu/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/Zbulu.kt b/lib-multisrc/zbulu/src/eu/kanade/tachiyomi/multisrc/zbulu/Zbulu.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/Zbulu.kt
rename to lib-multisrc/zbulu/src/eu/kanade/tachiyomi/multisrc/zbulu/Zbulu.kt
diff --git a/lib-multisrc/zeistmanga/build.gradle.kts b/lib-multisrc/zeistmanga/build.gradle.kts
new file mode 100644
index 000000000..6b8a110f9
--- /dev/null
+++ b/lib-multisrc/zeistmanga/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 8
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistManga.kt b/lib-multisrc/zeistmanga/src/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistManga.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistManga.kt
rename to lib-multisrc/zeistmanga/src/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistManga.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaDto.kt b/lib-multisrc/zeistmanga/src/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaDto.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaDto.kt
rename to lib-multisrc/zeistmanga/src/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaDto.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaFilters.kt b/lib-multisrc/zeistmanga/src/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaFilters.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaFilters.kt
rename to lib-multisrc/zeistmanga/src/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaFilters.kt
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaIntl.kt b/lib-multisrc/zeistmanga/src/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaIntl.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaIntl.kt
rename to lib-multisrc/zeistmanga/src/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaIntl.kt
diff --git a/lib-multisrc/zmanga/build.gradle.kts b/lib-multisrc/zmanga/build.gradle.kts
new file mode 100644
index 000000000..dc076cc37
--- /dev/null
+++ b/lib-multisrc/zmanga/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+ id("lib-multisrc")
+}
+
+baseVersionCode = 1
diff --git a/multisrc/overrides/zmanga/default/res/mipmap-hdpi/ic_launcher.png b/lib-multisrc/zmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/default/res/mipmap-hdpi/ic_launcher.png
rename to lib-multisrc/zmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/default/res/mipmap-mdpi/ic_launcher.png b/lib-multisrc/zmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/default/res/mipmap-mdpi/ic_launcher.png
rename to lib-multisrc/zmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/default/res/mipmap-xhdpi/ic_launcher.png b/lib-multisrc/zmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/default/res/mipmap-xhdpi/ic_launcher.png
rename to lib-multisrc/zmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/default/res/mipmap-xxhdpi/ic_launcher.png b/lib-multisrc/zmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/default/res/mipmap-xxhdpi/ic_launcher.png
rename to lib-multisrc/zmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/default/res/mipmap-xxxhdpi/ic_launcher.png b/lib-multisrc/zmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to lib-multisrc/zmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zmanga/ZManga.kt b/lib-multisrc/zmanga/src/eu/kanade/tachiyomi/multisrc/zmanga/ZManga.kt
similarity index 100%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zmanga/ZManga.kt
rename to lib-multisrc/zmanga/src/eu/kanade/tachiyomi/multisrc/zmanga/ZManga.kt
diff --git a/multisrc/build.gradle.kts b/multisrc/build.gradle.kts
deleted file mode 100644
index 7f1b536cb..000000000
--- a/multisrc/build.gradle.kts
+++ /dev/null
@@ -1,82 +0,0 @@
-plugins {
- id("com.android.library")
- kotlin("android")
- id("kotlinx-serialization")
-}
-
-android {
- compileSdk = AndroidConfig.compileSdk
-
- defaultConfig {
- minSdk = 29
- }
-
- namespace = "eu.kanade.tachiyomi.lib.themesources"
-
- kotlinOptions {
- freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
- }
-}
-
-repositories {
- mavenCentral()
-}
-
-configurations {
- compileOnly {
- isCanBeResolved = true
- }
-}
-
-dependencies {
- compileOnly(libs.bundles.common)
-
- // Only PeachScan sources uses the image-decoder dependency.
- //noinspection UseTomlInstead
- compileOnly("com.github.tachiyomiorg:image-decoder:fbd6601290")
-
- // Implements all :lib libraries on the multisrc generator
- // Note that this does not mean that generated sources are going to
- // implement them too; this is just to be able to compile and generate sources.
- rootProject.subprojects
- .filter { it.path.startsWith(":lib:") }
- .forEach(::implementation)
-}
-
-tasks {
- register("generateExtensions") {
- val buildDir = layout.buildDirectory.asFile.get()
- classpath = configurations.compileOnly.get() +
- configurations.androidApis.get() + // android.jar path
- files("$buildDir/intermediates/aar_main_jar/debug/classes.jar") // jar made from this module
- mainClass.set("generator.GeneratorMainKt")
-
- workingDir = workingDir.parentFile // project root
-
- errorOutput = System.out // for GitHub workflow commands
-
- if (!logger.isInfoEnabled) {
- standardOutput = org.gradle.internal.io.NullOutputStream.INSTANCE
- }
-
- dependsOn("ktLint", "assembleDebug")
- }
-
- register("ktLint") {
- if (project.hasProperty("theme")) {
- val theme = project.property("theme")
- source(files("src/main/java/eu/kanade/tachiyomi/multisrc/$theme", "overrides/$theme"))
- return@register
- }
- source(files("src", "overrides"))
- }
-
- register("ktFormat") {
- if (project.hasProperty("theme")) {
- val theme = project.property("theme")
- source(files("src/main/java/eu/kanade/tachiyomi/multisrc/$theme", "overrides/$theme"))
- return@register
- }
- source(files("src", "overrides"))
- }
-}
diff --git a/multisrc/overrides/bilibili/default/AndroidManifest.xml b/multisrc/overrides/bilibili/default/AndroidManifest.xml
deleted file mode 100644
index 4ca185feb..000000000
--- a/multisrc/overrides/bilibili/default/AndroidManifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/multisrc/overrides/madara/shinigami/additional.gradle b/multisrc/overrides/madara/shinigami/additional.gradle
deleted file mode 100644
index 0ffbe4386..000000000
--- a/multisrc/overrides/madara/shinigami/additional.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- implementation(project(":lib:synchrony"))
-}
diff --git a/multisrc/overrides/mangadventure/assortedscans/AndroidManifest.xml b/multisrc/overrides/mangadventure/assortedscans/AndroidManifest.xml
deleted file mode 100644
index 0a89d8d68..000000000
--- a/multisrc/overrides/mangadventure/assortedscans/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/multisrc/overrides/mmrcms/mangasin/additional.gradle b/multisrc/overrides/mmrcms/mangasin/additional.gradle
deleted file mode 100644
index 67bf8eb33..000000000
--- a/multisrc/overrides/mmrcms/mangasin/additional.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-dependencies {
- implementation(project(":lib:synchrony"))
- implementation(project(":lib:cryptoaes"))
-}
diff --git a/multisrc/overrides/monochrome/monochromecustom/AndroidManifest.xml b/multisrc/overrides/monochrome/monochromecustom/AndroidManifest.xml
deleted file mode 100644
index 8072ee00d..000000000
--- a/multisrc/overrides/monochrome/monochromecustom/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/multisrc/overrides/webtoons/webtoons/additional.gradle b/multisrc/overrides/webtoons/webtoons/additional.gradle
deleted file mode 100644
index f2fd3c255..000000000
--- a/multisrc/overrides/webtoons/webtoons/additional.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- implementation(project(':lib:textinterceptor'))
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/a3manga/A3MangaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/a3manga/A3MangaGenerator.kt
deleted file mode 100644
index 5f55dd968..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/a3manga/A3MangaGenerator.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.a3manga
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class A3MangaGenerator : ThemeSourceGenerator {
-
- override val themePkg = "a3manga"
-
- override val themeClass = "A3Manga"
-
- override val baseVersionCode: Int = 3
-
- override val sources = listOf(
- SingleLang("A3 Manga", "https://www.a3manga.store", "vi", overrideVersionCode = 2),
- SingleLang("Team Lanh Lung", "https://teamlanhlung.live", "vi", sourceName = "Team Lạnh Lùng", overrideVersionCode = 2),
- SingleLang("Ngon Phong", "https://www.ngonphong.com", "vi", sourceName = "Ngôn Phong", overrideVersionCode = 1),
- SingleLang("O Cu Meo", "https://www.ocumeo.store", "vi", sourceName = "Ổ Cú Mèo", overrideVersionCode = 2),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- A3MangaGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinGenerator.kt
deleted file mode 100644
index 8366dfe62..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinGenerator.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.bakkin
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class BakkinGenerator : ThemeSourceGenerator {
- override val themePkg = "bakkin"
-
- override val themeClass = "BakkinReaderX"
-
- override val baseVersionCode = 6
-
- override val sources = listOf(
- SingleLang("Bakkin", "https://bakkin.moe/reader/", "en"),
- SingleLang("Bakkin Self-hosted", "", "en", className = "BakkinSelfHosted"),
- SingleLang("UltraLight Scans", "https://readlight.org/", "en"),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) = BakkinGenerator().createAll()
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt
deleted file mode 100644
index 7fd830e6e..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.bilibili
-
-import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class BilibiliGenerator : ThemeSourceGenerator {
-
- override val themePkg = "bilibili"
-
- override val themeClass = "Bilibili"
-
- override val baseVersionCode: Int = 9
-
- override val sources = listOf(
- MultiLang(
- name = "BILIBILI COMICS",
- baseUrl = "https://www.bilibilicomics.com",
- langs = listOf("en", "zh-Hans", "id", "es", "fr"),
- className = "BilibiliComicsFactory",
- overrideVersionCode = 3,
- ),
- SingleLang(
- name = "BILIBILI MANGA",
- baseUrl = "https://manga.bilibili.com",
- lang = "zh-Hans",
- className = "BilibiliManga",
- sourceName = "哔哩哔哩漫画",
- overrideVersionCode = 2,
- ),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- BilibiliGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyenGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyenGenerator.kt
deleted file mode 100644
index 36980bed0..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyenGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.blogtruyen
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class BlogTruyenGenerator : ThemeSourceGenerator {
-
- override val themePkg = "blogtruyen"
-
- override val themeClass = "BlogTruyen"
-
- override val baseVersionCode = 1
-
- override val sources = listOf(
- SingleLang("BlogTruyen", "https://blogtruyenmoi.com", "vi", className = "BlogTruyenMoi", pkgName = "blogtruyen", overrideVersionCode = 17),
- SingleLang("BlogTruyen.vn (unoriginal)", "https://blogtruyenvn.com", "vi", className = "BlogTruyenVn"),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- BlogTruyenGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaGenerator.kt
deleted file mode 100644
index 7a67997b7..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.colamanga
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class ColaMangaGenerator : ThemeSourceGenerator {
-
- override val themePkg = "colamanga"
-
- override val themeClass = "ColaManga"
-
- override val baseVersionCode = 2
-
- override val sources = listOf(
- SingleLang("COLAMANGA", "https://www.colamanga.com", "zh", overrideVersionCode = 15, className = "Onemanhua"),
- SingleLang("MangaDig", "https://mangadig.com", "en", isNsfw = true),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- ColaMangaGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colorlibanime/ColorlibAnimeGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colorlibanime/ColorlibAnimeGenerator.kt
deleted file mode 100644
index 6813f71a5..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/colorlibanime/ColorlibAnimeGenerator.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.colorlibanime
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class ColorlibAnimeGenerator : ThemeSourceGenerator {
-
- override val themePkg = "colorlibanime"
-
- override val themeClass = "ColorlibAnime"
-
- override val baseVersionCode: Int = 1
-
- override val sources = listOf(
- SingleLang("Sekte Komik", "https://sektekomik.xyz", "id", overrideVersionCode = 26),
- SingleLang("Komikzoid", "https://komikzoid.id", "id"),
- SingleLang("Neumanga", "https://neumanga.xyz", "id", overrideVersionCode = 1),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- ColorlibAnimeGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGammaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGammaGenerator.kt
deleted file mode 100644
index 16e040cf2..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGammaGenerator.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.comicgamma
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class ComicGammaGenerator : ThemeSourceGenerator {
- override val themeClass = "ComicGamma"
- override val themePkg = "comicgamma"
- override val baseVersionCode = 6
- override val sources = listOf(
- SingleLang(
- name = "Web Comic Gamma",
- baseUrl = "https://webcomicgamma.takeshobo.co.jp",
- lang = "ja",
- isNsfw = false,
- className = "WebComicGamma",
- pkgName = "webcomicgamma",
- sourceName = "Web Comic Gamma",
- overrideVersionCode = 0,
- ),
- SingleLang(
- name = "Web Comic Gamma Plus",
- baseUrl = "https://gammaplus.takeshobo.co.jp",
- lang = "ja",
- isNsfw = true,
- className = "WebComicGammaPlus",
- pkgName = "webcomicgammaplus",
- sourceName = "Web Comic Gamma Plus",
- overrideVersionCode = 0,
- ),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- ComicGammaGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuseGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuseGenerator.kt
deleted file mode 100644
index 97c3e7653..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuseGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.eromuse
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class EroMuseGenerator : ThemeSourceGenerator {
-
- override val themePkg = "eromuse"
-
- override val themeClass = "EroMuse"
-
- override val baseVersionCode: Int = 1
-
- override val sources = listOf(
- SingleLang("8Muses", "https://comics.8muses.com", "en", className = "EightMuses", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Erofus", "https://www.erofus.com", "en", isNsfw = true, overrideVersionCode = 1),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- EroMuseGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fansubscat/FansubsCatGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fansubscat/FansubsCatGenerator.kt
deleted file mode 100644
index 9271d2c6e..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fansubscat/FansubsCatGenerator.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.fansubscat
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class FansubsCatGenerator : ThemeSourceGenerator {
-
- override val themePkg = "fansubscat"
-
- override val themeClass = "FansubsCat"
-
- override val baseVersionCode = 4
-
- override val sources = listOf(
- SingleLang(
- name = "Fansubs.cat",
- baseUrl = "https://manga.fansubs.cat",
- lang = "ca",
- className = "FansubsCatMain",
- isNsfw = false,
- pkgName = "fansubscat",
- ),
- SingleLang(
- name = "Fansubs.cat - Hentai",
- baseUrl = "https://hentai.fansubs.cat/manga",
- lang = "ca",
- className = "FansubsCatHentai",
- isNsfw = true,
- ),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) = FansubsCatGenerator().createAll()
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenerator.kt
deleted file mode 100644
index bec3a0f59..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.flixscans
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class FlixScansGenerator : ThemeSourceGenerator {
-
- override val themePkg = "flixscans"
-
- override val themeClass = "FlixScans"
-
- override val baseVersionCode: Int = 5
-
- override val sources = listOf(
- SingleLang("Flix Scans", "https://flixscans.org", "en", className = "FlixScansNet", pkgName = "flixscans"),
- SingleLang("Galaxy Manga", "https://flixscans.com", "ar", sourceName = "جالاكسي مانجا", overrideVersionCode = 26),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- FlixScansGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReaderGenerator.kt
deleted file mode 100644
index 7e655c386..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReaderGenerator.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.fmreader
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class FMReaderGenerator : ThemeSourceGenerator {
-
- override val themePkg = "fmreader"
-
- override val themeClass = "FMReader"
-
- override val baseVersionCode: Int = 9
-
- override val sources = listOf(
- SingleLang("KissLove", "https://klz9.com", "ja", isNsfw = true, overrideVersionCode = 5),
- SingleLang("Manga-TR", "https://manga-tr.com", "tr", className = "MangaTR", overrideVersionCode = 3),
- SingleLang("Manga1000", "https://manga1000.top", "ja", overrideVersionCode = 2),
- SingleLang("Nicomanga", "https://nicomanga.com", "ja", isNsfw = true),
- SingleLang("WeLoveManga", "https://weloma.art", "ja", pkgName = "rawlh", isNsfw = true, overrideVersionCode = 5),
- SingleLang("WeLoveMangaOne", "https://welovemanga.one", "ja", isNsfw = true, overrideVersionCode = 1),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- FMReaderGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlideGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlideGenerator.kt
deleted file mode 100644
index 01d37e046..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlideGenerator.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.foolslide
-
-import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class FoolSlideGenerator : ThemeSourceGenerator {
-
- override val themePkg = "foolslide"
-
- override val themeClass = "FoolSlide"
-
- override val baseVersionCode: Int = 3
-
- override val sources = listOf(
- MultiLang("FoolSlide Customizable", "", listOf("other")),
- MultiLang("HNI-Scantrad", "https://hni-scantrad.com", listOf("fr", "en"), className = "HNIScantradFactory", pkgName = "hniscantrad", overrideVersionCode = 1),
- SingleLang("Anata no Motokare", "https://motokare.xyz", "en", className = "AnataNoMotokare"),
- SingleLang("Death Toll Scans", "https://reader.deathtollscans.net", "en"),
- SingleLang("Evil Flowers", "https://reader.evilflowers.com", "en", overrideVersionCode = 1),
- SingleLang("Mangatellers", "https://reader.mangatellers.gr", "en"),
- SingleLang("Menudo-Fansub", "https://www.menudo-fansub.com", "es", className = "MenudoFansub", overrideVersionCode = 1),
- SingleLang("NIFTeam", "http://read-nifteam.info", "it"),
- SingleLang("Rama", "https://www.ramareader.it", "it"),
- SingleLang("Silent Sky", "https://reader.silentsky-scans.net", "en"),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- FoolSlideGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gattsu/GattsuGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gattsu/GattsuGenerator.kt
deleted file mode 100644
index 7df106d59..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gattsu/GattsuGenerator.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.gattsu
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class GattsuGenerator : ThemeSourceGenerator {
-
- override val themePkg = "gattsu"
-
- override val themeClass = "Gattsu"
-
- override val baseVersionCode: Int = 5
-
- override val sources = listOf(
- SingleLang("Hentai Season", "https://hentaiseason.com", "pt-BR", isNsfw = true),
- SingleLang("Hentai Tokyo", "https://hentaitokyo.net", "pt-BR", isNsfw = true),
- SingleLang("Universo Hentai", "https://universohentai.com", "pt-BR", isNsfw = true),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- GattsuGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewerGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewerGenerator.kt
deleted file mode 100644
index b60512c0f..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewerGenerator.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.gigaviewer
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class GigaViewerGenerator : ThemeSourceGenerator {
-
- override val themePkg = "gigaviewer"
-
- override val themeClass = "GigaViewer"
-
- override val baseVersionCode: Int = 5
-
- override val sources = listOf(
- SingleLang("Comic Days", "https://comic-days.com", "ja"),
- SingleLang("Comic Gardo", "https://comic-gardo.com", "ja"),
- SingleLang("Comiplex", "https://viewer.heros-web.com", "ja"),
- SingleLang("Corocoro Online", "https://corocoro.jp", "ja"),
- SingleLang("Kurage Bunch", "https://kuragebunch.com", "ja"),
- SingleLang("MAGCOMI", "https://magcomi.com", "ja", className = "MagComi"),
- SingleLang("Magazine Pocket", "https://pocket.shonenmagazine.com", "ja"),
- SingleLang("Shonen Jump+", "https://shonenjumpplus.com", "ja", className = "ShonenJumpPlus", overrideVersionCode = 2),
- SingleLang("Sunday Web Every", "https://www.sunday-webry.com", "ja"),
- SingleLang("Tonari no Young Jump", "https://tonarinoyj.jp", "ja", className = "TonariNoYoungJump"),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- GigaViewerGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gravureblogger/GravureBloggerGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gravureblogger/GravureBloggerGenerator.kt
deleted file mode 100644
index 9a39e27c9..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gravureblogger/GravureBloggerGenerator.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.gravureblogger
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class GravureBloggerGenerator : ThemeSourceGenerator {
-
- override val themePkg = "gravureblogger"
-
- override val themeClass = "GravureBlogger"
-
- override val baseVersionCode = 1
-
- override val sources = listOf(
- SingleLang(
- name = "Idol. gravureprincess .date",
- baseUrl = "https://idol.gravureprincess.date",
- lang = "ja",
- isNsfw = true,
- className = "IdolGravureprincessDate",
- ),
- SingleLang(
- name = "MIC MIC IDOL",
- baseUrl = "https://www.micmicidol.club",
- lang = "ja",
- isNsfw = true,
- className = "MicMicIdol",
- overrideVersionCode = 1,
- ),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- GravureBloggerGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeGenerator.kt
deleted file mode 100644
index 6468bcbf5..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeGenerator.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.grouple
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class GroupLeGenerator : ThemeSourceGenerator {
-
- override val themePkg = "grouple"
-
- override val themeClass = "GroupLe"
-
- override val baseVersionCode = 22
-
- override val sources = listOf(
- SingleLang("ReadManga", "https://readmanga.live", "ru", overrideVersionCode = 46),
- SingleLang("MintManga", "https://mintmanga.com", "ru", isNsfw = true, overrideVersionCode = 46),
- SingleLang("AllHentai", "https://z.allhen.online", "ru", isNsfw = true, overrideVersionCode = 22),
- SingleLang("SelfManga", "https://selfmanga.live", "ru", overrideVersionCode = 22),
- SingleLang("RuMIX", "https://rumix.me", "ru", overrideVersionCode = 1),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- GroupLeGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/GuyaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/GuyaGenerator.kt
deleted file mode 100644
index cf8b4bca1..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/GuyaGenerator.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.guya
-
-import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class GuyaGenerator : ThemeSourceGenerator {
-
- override val themePkg = "guya"
-
- override val themeClass = "Guya"
-
- override val baseVersionCode = 5
-
- override val sources = listOf(
- SingleLang("Guya", "https://guya.cubari.moe", "en", overrideVersionCode = 18),
- SingleLang("Danke fürs Lesen", "https://danke.moe", "en", className = "DankeFursLesen"),
- SingleLang("Hachirumi", "https://hachirumi.com", "en", isNsfw = true),
- MultiLang("Magical Translators", "https://mahoushoujobu.com", listOf("en", "es", "pl"), overrideVersionCode = 1),
- )
- companion object {
- @JvmStatic
- fun main(args: Array) {
- GuyaGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsGenerator.kt
deleted file mode 100644
index 2d41fd8cb..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/heancms/HeanCmsGenerator.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.heancms
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class HeanCmsGenerator : ThemeSourceGenerator {
-
- override val themePkg = "heancms"
-
- override val themeClass = "HeanCms"
-
- override val baseVersionCode: Int = 20
-
- override val sources = listOf(
- SingleLang("Omega Scans", "https://omegascans.org", "en", isNsfw = true, overrideVersionCode = 18),
- SingleLang("Perf Scan", "https://perf-scan.fr", "fr"),
- SingleLang("Temple Scan", "https://templescan.net", "en", isNsfw = true, overrideVersionCode = 16),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- HeanCmsGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/hentaihand/HentaiHandGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/hentaihand/HentaiHandGenerator.kt
deleted file mode 100644
index 3b5a4855c..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/hentaihand/HentaiHandGenerator.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.hentaihand
-
-import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class HentaiHandGenerator : ThemeSourceGenerator {
-
- override val themePkg = "hentaihand"
-
- override val themeClass = "HentaiHand"
-
- override val baseVersionCode: Int = 2
-
- override val sources = listOf(
- MultiLang("HentaiHand", "https://hentaihand.com", listOf("all", "ja", "en", "zh", "bg", "ceb", "other", "tl", "ar", "el", "sr", "jv", "uk", "tr", "fi", "la", "mn", "eo", "sk", "cs", "ko", "ru", "it", "es", "pt-BR", "th", "fr", "id", "vi", "de", "pl", "hu", "nl", "hi"), isNsfw = true, overrideVersionCode = 5),
- MultiLang("nHentai.com (unoriginal)", "https://nhentai.com", listOf("all", "ja", "en", "zh", "bg", "ceb", "other", "tl", "ar", "el", "sr", "jv", "uk", "tr", "fi", "la", "mn", "eo", "sk", "cs", "ko", "ru", "it", "es", "pt-BR", "th", "fr", "id", "vi", "de", "pl", "hu", "nl", "hi"), isNsfw = true, className = "NHentaiComFactory", overrideVersionCode = 4),
- SingleLang("ManhwaClub", "https://manhwa.club", "en", isNsfw = true, overrideVersionCode = 3),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- HentaiHandGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/KemonoGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/KemonoGenerator.kt
deleted file mode 100644
index 90217530b..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/KemonoGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.kemono
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class KemonoGenerator : ThemeSourceGenerator {
-
- override val themeClass = "Kemono"
-
- override val themePkg = "kemono"
-
- override val baseVersionCode = 10
-
- override val sources = listOf(
- SingleLang("Kemono", "https://kemono.su", "all", isNsfw = true),
- SingleLang("Coomer", "https://coomer.su", "all", isNsfw = true),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- KemonoGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoGenerator.kt
deleted file mode 100644
index afba347e9..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.lectortmo
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class LectorTmoGenerator : ThemeSourceGenerator {
-
- override val themePkg = "lectortmo"
-
- override val themeClass = "LectorTmo"
-
- override val baseVersionCode: Int = 3
-
- override val sources = listOf(
- SingleLang("LectorManga", "https://lectormanga.com", "es", isNsfw = true, overrideVersionCode = 34),
- SingleLang("TuMangaOnline", "https://visortmo.com", "es", isNsfw = true, overrideVersionCode = 49),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- LectorTmoGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt
deleted file mode 100644
index 12bd8523d..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.libgroup
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class LibGenerator : ThemeSourceGenerator {
-
- override val themePkg = "libgroup"
-
- override val themeClass = "LibGroup"
-
- override val baseVersionCode: Int = 25
-
- override val sources = listOf(
- SingleLang("MangaLib", "https://mangalib.me", "ru", overrideVersionCode = 74),
- SingleLang("HentaiLib", "https://hentailib.me", "ru", isNsfw = true, overrideVersionCode = 19),
- SingleLang("YaoiLib", "https://v1.slashlib.me", "ru", isNsfw = true, overrideVersionCode = 2),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- LibGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/likemanga/LikeMangaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/likemanga/LikeMangaGenerator.kt
deleted file mode 100644
index 5a51876d6..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/likemanga/LikeMangaGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.likemanga
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class LikeMangaGenerator : ThemeSourceGenerator {
-
- override val themePkg = "likemanga"
-
- override val themeClass = "LikeManga"
-
- override val baseVersionCode: Int = 1
-
- override val sources = listOf(
- SingleLang("LikeManga", "https://likemanga.io", "en", className = "LikeMangaIO", pkgName = "likemanga", overrideVersionCode = 3),
- SingleLang("ZinManga.io", "https://zinmanga.io", "en", className = "ZinMangaIO", pkgName = "zinmanhwa", overrideVersionCode = 34),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- LikeMangaGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
deleted file mode 100644
index 00af5874c..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
+++ /dev/null
@@ -1,500 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.madara
-
-import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MadaraGenerator : ThemeSourceGenerator {
-
- override val themePkg = "madara"
-
- override val themeClass = "Madara"
-
- override val baseVersionCode: Int = 33
-
- override val sources = listOf(
- MultiLang("MangaForFree.net", "https://mangaforfree.net", listOf("en", "ko", "all"), isNsfw = true, className = "MangaForFreeFactory", pkgName = "mangaforfree", overrideVersionCode = 1),
- MultiLang("Manhwa18.cc", "https://manhwa18.cc", listOf("en", "ko", "all"), isNsfw = true, className = "Manhwa18CcFactory", pkgName = "manhwa18cc", overrideVersionCode = 4),
- SingleLang("1st Kiss-Manga (unoriginal)", "https://1stkiss-manga.com", "en", className = "FirstKissDashManga"),
- SingleLang("1st Manhwa", "https://1stmanhwa.com", "en", isNsfw = true, className = "FirstManhwa"),
- SingleLang("247Manga", "https://247manga.com", "en", className = "Manga247", overrideVersionCode = 1),
- SingleLang("Adonis Fansub", "https://manga.adonisfansub.com", "tr", overrideVersionCode = 1),
- SingleLang("Adult Webtoon", "https://adultwebtoon.com", "en", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Akimangá", "https://akimanga.com", "pt-BR", isNsfw = true, className = "Akimanga"),
- SingleLang("AllPornComic", "https://allporncomic.com", "en", isNsfw = true),
- SingleLang("Amuy", "https://apenasmaisumyaoi.com", "pt-BR", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Anikiga", "https://anikiga.com", "tr"),
- SingleLang("Anisa Manga", "https://anisamanga.com", "tr"),
- SingleLang("Ansh Scans", "https://anshscans.org", "en", overrideVersionCode = 1),
- SingleLang("ApollComics", "https://apollcomics.xyz", "es", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Apolltoons", "https://apolltoons.xyz", "es", isNsfw = true),
- SingleLang("Armoni Scans", "https://armoniscans.net", "tr"),
- SingleLang("Aqua Manga", "https://aquamanga.org", "en", overrideVersionCode = 8),
- SingleLang("AQUA Scans", "https://aquascans.com", "en", className = "ManhwaWorld", overrideVersionCode = 1),
- SingleLang("ArazNovel", "https://www.araznovel.com", "tr", overrideVersionCode = 3),
- SingleLang("Arcanescans", "https://arcanescans.com", "en"),
- SingleLang("Arthur Scan", "https://arthurscan.xyz", "pt-BR", overrideVersionCode = 4),
- SingleLang("Astral-Manga", "https://astral-manga.fr", "fr", className = "AstralManga"),
- SingleLang("Astrum Scans", "https://astrumscans.xyz", "pt-BR", isNsfw = true),
- SingleLang("Asura Scans.us (unoriginal)", "https://asurascans.us", "en", className = "AsuraScansUs"),
- SingleLang("Azora", "https://azoramoon.com", "ar", overrideVersionCode = 7),
- SingleLang("Babel Wuxia", "https://babelwuxia.com", "en", overrideVersionCode = 1),
- SingleLang("Baka Manhua", "https://bakamh.com", "zh", isNsfw = true, className = "Bakamh", sourceName = "巴卡漫画"),
- SingleLang("Bakaman", "https://bakaman.net", "th", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Banana Manga", "https://bananamanga.net", "en", isNsfw = true),
- SingleLang("BarManga", "https://barmanga.com", "es"),
- SingleLang("BestManga", "https://bestmanga.club", "ru", overrideVersionCode = 1),
- SingleLang("BestManhua", "https://bestmanhua.com", "en", overrideVersionCode = 2),
- SingleLang("BirdToon", "https://birdtoon.net", "id", isNsfw = true),
- SingleLang("BokugenTranslation", "https://bokugents.com", "es", overrideVersionCode = 1),
- SingleLang("Boruto Explorer", "https://leitor.borutoexplorer.com.br", "pt-BR", overrideVersionCode = 1),
- SingleLang("BoysLove", "https://boyslove.me", "en", isNsfw = true, overrideVersionCode = 3),
- SingleLang("Burning Scans", "https://burningscans.com", "pt-BR", isNsfw = true),
- SingleLang("Café com Yaoi", "http://cafecomyaoi.com.br", "pt-BR", className = "CafeComYaoi", isNsfw = true, overrideVersionCode = 1),
- SingleLang("CAT-translator", "https://cats-translator.com/manga", "th", className = "CatTranslator", overrideVersionCode = 2),
- SingleLang("Cat300", "https://cat300.com", "th", isNsfw = true, overrideVersionCode = 1),
- SingleLang("CBHentai", "https://cbhentai.net", "vi", isNsfw = true, overrideVersionCode = 7, pkgName = "hentaicube", className = "HentaiCB"),
- SingleLang("Cerise Scan", "https://cerisescan.net", "pt-BR", pkgName = "cerisescans", isNsfw = true, overrideVersionCode = 8),
- SingleLang("Clover Manga", "https://clover-manga.com", "tr", overrideVersionCode = 2),
- SingleLang("Coco Rip", "https://cocorip.net", "es"),
- SingleLang("Coffee Manga", "https://coffeemanga.io", "en", overrideVersionCode = 2),
- SingleLang("Colored Manga", "https://coloredmanga.com", "en", overrideVersionCode = 2),
- SingleLang("Comic Scans", "https://www.comicscans.org", "en"),
- SingleLang("Comics Valley", "https://comicsvalley.com", "hi", isNsfw = true, overrideVersionCode = 1),
- SingleLang("ComicsWorld", "https://comicsworld.in", "hi"),
- SingleLang("Comicz.net v2", "https://v2.comiz.net", "all", isNsfw = true, className = "ComiczNetV2"),
- SingleLang("Cookie Kiara", "https://18.kiara.cool", "en", isNsfw = true),
- SingleLang("CopyPasteScan", "https://copypastescan.xyz", "es", overrideVersionCode = 1),
- SingleLang("CreepyScans", "https://creepyscans.com", "en", overrideVersionCode = 1),
- SingleLang("DapRob", "https://daprob.com", "es"),
- SingleLang("Dark Scans", "https://darkscans.com", "en", overrideVersionCode = 1),
- SingleLang("Dark-scan", "https://dark-scan.com", "en", isNsfw = true, className = "DarkScan"),
- SingleLang("Decadence Scans", "https://reader.decadencescans.com", "en", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Demon Sect", "https://demonsect.com.br", "pt-BR", pkgName = "prismascans", overrideVersionCode = 4),
- SingleLang("Dessert Scan", "https://cabaredowatame.site", "pt-BR", isNsfw = true),
- SingleLang("DiamondFansub", "https://diamondfansub.com", "tr", overrideVersionCode = 1),
- SingleLang("Doodmanga", "https://www.doodmanga.com", "th"),
- SingleLang("DoujinHentai", "https://doujinhentai.net", "es", isNsfw = true, overrideVersionCode = 1),
- SingleLang("DragonTea", "https://dragontea.ink", "en", overrideVersionCode = 3),
- SingleLang("DragonTranslation.net", "https://dragontranslation.net", "es", isNsfw = true, className = "DragonTranslationNet"),
- SingleLang("Drake Scans", "https://drakescans.com", "en", overrideVersionCode = 4),
- SingleLang("Drope Scan", "https://dropescan.com", "pt-BR", overrideVersionCode = 4),
- SingleLang("Elite Manga", "https://www.elitemanga.org", "en"),
- SingleLang("Emperor Scan", "https://emperorscan.com", "es", overrideVersionCode = 1),
- SingleLang("Empire Webtoon", "https://webtoonsempireron.com", "ar", isNsfw = true, overrideVersionCode = 3),
- SingleLang("Eromiau", "https://www.eromiau.com", "es", isNsfw = true),
- SingleLang("Esomanga", "https://esomanga.com", "tr", overrideVersionCode = 1),
- SingleLang("EZmanga", "https://ezmanga.net", "en"),
- SingleLang("FactManga", "https://factmanga.com", "en"),
- SingleLang("Fay Scans", "https://fayscans.net", "pt-BR", overrideVersionCode = 2),
- SingleLang("Fire Scans", "https://firescans.xyz", "en", overrideVersionCode = 1),
- SingleLang("Fleur Blanche", "https://fbsquads.com", "pt-BR", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Flower Manga", "https://flowermanga.com", "pt-BR"),
- SingleLang("Fox White", "https://foxwhite.com.br", "pt-BR"),
- SingleLang("FR-Scan", "https://fr-scan.com", "fr", pkgName = "frdashscan", className = "FRScan", overrideVersionCode = 5),
- SingleLang("Free Manga", "https://freemanga.me", "en", isNsfw = true, overrideVersionCode = 3),
- SingleLang("Free Manhwa", "https://manhwas.com", "en"),
- SingleLang("FreeMangaTop", "https://freemangatop.com", "en", overrideVersionCode = 2),
- SingleLang("FreeWebtoonCoins", "https://freewebtooncoins.com", "en", overrideVersionCode = 1),
- SingleLang("GalaxyDegenScans", "https://gdscans.com", "en", overrideVersionCode = 4),
- SingleLang("Gatemanga", "https://gatemanga.com", "ar", overrideVersionCode = 2),
- SingleLang("Gekkou Scans", "https://gekkou.site", "pt-BR", isNsfw = true, pkgName = "gekkouscan", overrideVersionCode = 2),
- SingleLang("Ghost Scan", "https://ghostscan.com.br", "pt-BR", isNsfw = true),
- SingleLang("Girls Love Manga!", "https://glmanga.com", "en", isNsfw = true, className = "GirlsLoveManga"),
- SingleLang("Global Bloging", "https://globalbloging.com", "en"),
- SingleLang("Glory Manga", "https://glorymanga.com", "tr"),
- SingleLang("Good Girls Scan", "https://goodgirls.moe", "en", isNsfw = true),
- SingleLang("Goof Fansub", "https://gooffansub.com", "pt-BR", isNsfw = true),
- SingleLang("Gourmet Scans", "https://gourmetsupremacy.com", "en", isNsfw = true),
- SingleLang("Grabber Zone", "https://grabber.zone", "all"),
- SingleLang("Gri Melek", "https://grimelek.net", "tr", isNsfw = true, className = "Siyahmelek", overrideVersionCode = 4),
- SingleLang("GuncelManga", "https://guncelmanga.com", "tr", overrideVersionCode = 1),
- SingleLang("Hades no Fansub Hentai", "https://h.mangareaderpro.com", "es", isNsfw = true),
- SingleLang("Hades no Fansub", "https://hadesnofansub.com", "es", isNsfw = true, overrideVersionCode = 2, className = "HadesNoFansub"),
- SingleLang("Harimanga", "https://harimanga.com", "en", overrideVersionCode = 3),
- SingleLang("Hattori Manga", "https://hattorimanga.com", "tr", isNsfw = true),
- SingleLang("Hayalistic", "https://hayalistic.com", "tr"),
- SingleLang("Hentai Manga", "https://hentaimanga.me", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Hentai Teca", "https://hentaiteca.net", "pt-BR", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Hentai-Scantrad", "https://hentai.scantrad-vf.cc", "fr", isNsfw = true, className = "HentaiScantrad", overrideVersionCode = 1),
- SingleLang("Hentai3z", "https://hentai3z.xyz", "en", isNsfw = true),
- SingleLang("Hentai4Free", "https://hentai4free.net", "en", isNsfw = true),
- SingleLang("HentaiRead", "https://hentairead.com", "en", isNsfw = true, className = "Hentairead", overrideVersionCode = 3),
- SingleLang("HentaiWebtoon", "https://hentaiwebtoon.com", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("HentaiXComic", "https://hentaixcomic.com", "en", isNsfw = true),
- SingleLang("HentaiXDickgirl", "https://hentaixdickgirl.com", "en", isNsfw = true),
- SingleLang("HentaiXYuri", "https://hentaixyuri.com", "en", isNsfw = true),
- SingleLang("HentaiZM", "https://manga.hentaizm.fun", "tr", isNsfw = true),
- SingleLang("HentaiZone", "https://hentaizone.xyz", "fr", isNsfw = true, overrideVersionCode = 1),
- SingleLang("HerenScan", "https://herenscan.com", "es"),
- SingleLang("HipercooL", "https://hiper.cool", "pt-BR", isNsfw = true, className = "Hipercool", overrideVersionCode = 1),
- SingleLang("Hiperdex", "https://hiperdex.com", "en", isNsfw = true, overrideVersionCode = 11),
- SingleLang("HistoireDHentai", "https://hhentai.fr", "fr", isNsfw = true),
- SingleLang("Hizomanga", "https://hizomanga.me", "ar", overrideVersionCode = 2),
- SingleLang("HM2D", "https://mangadistrict.com/hdoujin", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("HouseMangas", "https://housemangas.com", "es"),
- SingleLang("Hreads", "https://hreads.net", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Hunters Scans", "https://huntersscan.xyz", "pt-BR", isNsfw = true),
- SingleLang("I Love Manhwa", "https://ilovemanhwa.com", "en", isNsfw = true),
- SingleLang("Illusion Scan", "https://illusionscan.com", "pt-BR", isNsfw = true),
- SingleLang("Immortal Updates", "https://immortalupdates.com", "en", overrideVersionCode = 6),
- SingleLang("InfraFandub", "https://infrafandub.com", "es", overrideVersionCode = 1),
- SingleLang("Inmortal Scan", "https://manga.mundodrama.site", "es"),
- SingleLang("InstaManhwa", "https://www.instamanhwa.com", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("IsekaiScan.to (unoriginal)", "https://m.isekaiscan.to", "en", isNsfw = true, pkgName = "isekaiscaneu", className = "IsekaiScanTo", overrideVersionCode = 3),
- SingleLang("IsekaiScan.top (unoriginal)", "https://isekaiscan.top", "en", className = "IsekaiScanTop", overrideVersionCode = 1),
- SingleLang("IsekaiScanManga (unoriginal)", "https://isekaiscanmanga.com", "en", className = "IsekaiScanManga", overrideVersionCode = 1),
- SingleLang("Its Your Right Manhua", "https://itsyourightmanhua.com", "en", overrideVersionCode = 2),
- SingleLang("Jiangzaitoon", "https://jiangzaitoon.info", "tr", isNsfw = true, overrideVersionCode = 4),
- SingleLang("Jimanga", "https://jimanga.com", "en"),
- SingleLang("Kakusei Project", "https://kakuseiproject.com.br", "pt-BR"),
- SingleLang("Kami Sama Explorer", "https://leitor.kamisama.com.br", "pt-BR", overrideVersionCode = 2),
- SingleLang("KenhuaScan", "https://kenhuav2scan.com", "es"),
- SingleLang("Kings-Manga", "https://www.kings-manga.co", "th", className = "KingsManga"),
- SingleLang("Kissmanga.in", "https://kissmanga.in", "en", className = "KissmangaIn", overrideVersionCode = 3),
- SingleLang("KlikManga", "https://klikmanga.id", "id", overrideVersionCode = 2),
- SingleLang("Knight No Scanlation", "https://knightnoscanlation.com", "es", isNsfw = true),
- SingleLang("Koinobori Scan", "https://koinoboriscan.com", "es", isNsfw = true),
- SingleLang("Komik Chan", "https://komikchan.com", "en", overrideVersionCode = 1),
- SingleLang("Komik Gue", "https://komikgue.pro", "id", isNsfw = true),
- SingleLang("KSGroupScans", "https://ksgroupscans.com", "en"),
- SingleLang("Kun Manga", "https://kunmanga.com", "en", overrideVersionCode = 1),
- SingleLang("Lady Manga", "https://ladymanga.com", "en"),
- SingleLang("Lala Manga", "https://lalamanga.com", "en", isNsfw = true),
- SingleLang("Last Knight Translation", "https://lkscanlation.com", "es", isNsfw = true, className = "LKScanlation"),
- SingleLang("Lector Online", "https://lectorunm.life", "es", isNsfw = true, className = "Ikifeng", overrideVersionCode = 1),
- SingleLang("LectorManga.lat", "https://www.lectormanga.lat", "es", isNsfw = true, className = "LectorMangaLat"),
- SingleLang("Ler Yaoi", "https://leryaoi.com", "pt-BR", isNsfw = true),
- SingleLang("Leviatan Scans", "https://lscomic.com", "en", overrideVersionCode = 15),
- SingleLang("LHTranslation", "https://lhtranslation.net", "en", overrideVersionCode = 1),
- SingleLang("Lily Manga", "https://lilymanga.net", "en", isNsfw = true, overrideVersionCode = 3),
- SingleLang("Limbo Scan", "https://limboscan.com.br", "pt-BR", isNsfw = true),
- SingleLang("Link Start Scan", "https://www.linkstartscan.xyz", "pt-BR", isNsfw = true),
- SingleLang("Lolicon", "https://lolicon.mobi", "en", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Luffy Manga", "https://luffymanga.com", "en"),
- SingleLang("Lura Toon", "https://luratoon.com", "pt-BR", overrideVersionCode = 7, pkgName = "randomscan", className = "LuraToon"),
- SingleLang("LuxManga", "https://luxmanga.net", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("MadaraDex", "https://madaradex.org", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Maid Scan", "https://maidscan.com.br", "pt-BR"),
- SingleLang("Manga 18h", "https://manga18h.com", "en", isNsfw = true),
- SingleLang("Manga 18x", "https://manga18x.net", "en", isNsfw = true),
- SingleLang("Manga Action", "https://mangaaction.com", "en", overrideVersionCode = 2),
- SingleLang("Manga Bee", "https://mangabee.net", "en", isNsfw = true),
- SingleLang("Manga Bin", "https://mangabin.com", "en", overrideVersionCode = 1),
- SingleLang("Manga Chill", "https://toonchill.com", "en", overrideVersionCode = 7),
- SingleLang("Manga Crab", "https://mangacrab3.com", "es", overrideVersionCode = 7),
- SingleLang("Manga District", "https://mangadistrict.com", "en", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Manga Diyari", "https://manga-diyari.com", "tr", overrideVersionCode = 2),
- SingleLang("Manga Galaxy", "https://mangagalaxy.me", "en", overrideVersionCode = 1),
- SingleLang("Manga Hentai", "https://mangahentai.me", "en", isNsfw = true, overrideVersionCode = 3),
- SingleLang("Manga Keyfi", "https://mangakeyfi.net", "tr"),
- SingleLang("Manga Kiss", "https://mangakiss.org", "en", overrideVersionCode = 1),
- SingleLang("Manga Kitsu", "https://mangakitsu.com", "en"),
- SingleLang("Manga Leveling", "https://mangaleveling.com", "en", overrideVersionCode = 1),
- SingleLang("Manga Mammy", "https://mangamammy.ru", "ru", isNsfw = true),
- SingleLang("Manga Mitsu", "https://mangamitsu.com", "en", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Manga Nerds", "https://manganerds.com", "en"),
- SingleLang("Manga One Love", "https://mangaonelove.site", "ru", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Manga Online Team", "https://mangaonlineteam.com", "en"),
- SingleLang("Manga Queen", "https://mangaqueen.net", "en"),
- SingleLang("Manga Queen.com", "https://mangaqueen.com", "en", isNsfw = true, className = "MangaQueenCom"),
- SingleLang("Manga Read", "https://mangaread.co", "en", overrideVersionCode = 1),
- SingleLang("Manga Rock Team", "https://mangarockteam.com", "en", overrideVersionCode = 1),
- SingleLang("Manga Rock.team (unoriginal)", "https://mangarock.team", "en", className = "MangaRockTeamUnoriginal"),
- SingleLang("Manga Rocky", "https://mangarocky.com", "en", overrideVersionCode = 1),
- SingleLang("Manga Rose", "https://mangarose.net", "ar"),
- SingleLang("Manga Starz", "https://mangastarz.org", "ar", overrideVersionCode = 5),
- SingleLang("Manga Too", "https://mangatoo.com", "en", overrideVersionCode = 1),
- SingleLang("Manga Tx.gg (unoriginal)", "https://mangatx.gg", "en", className = "MangaTxGg"),
- SingleLang("Manga Weebs", "https://mangaweebs.in", "en", overrideVersionCode = 8),
- SingleLang("Manga Şehri", "https://manga-sehri.com", "tr", className = "MangaSehri", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Manga-1001.com", "https://manga-1001.com", "en", className = "MangaDash1001Com"),
- SingleLang("Manga-fast.com", "https://manga-fast.com", "en", className = "Mangafastcom", overrideVersionCode = 3),
- SingleLang("Manga-Raw.info (unoriginal)", "https://manga-raw.info", "en", isNsfw = true, className = "MangaRawInfo"),
- SingleLang("Manga-Scantrad", "https://manga-scantrad.io", "fr", className = "MangaScantrad", overrideVersionCode = 3),
- SingleLang("Manga-TX", "https://manga-tx.com", "en", className = "Mangatxunoriginal"),
- SingleLang("Manga18fx", "https://manga18fx.com", "en", isNsfw = true, overrideVersionCode = 5),
- SingleLang("Manga1st.online", "https://manga1st.online", "en", className = "MangaFirstOnline", overrideVersionCode = 1),
- SingleLang("Manga347", "https://manga347.com", "en", overrideVersionCode = 3),
- SingleLang("Manga3S", "https://manga3s.com", "en", overrideVersionCode = 4),
- SingleLang("Manga68", "https://manga68.com", "en", overrideVersionCode = 1),
- SingleLang("MangaBob", "https://mangabob.com", "en", overrideVersionCode = 1),
- SingleLang("MangaClash", "https://mangaclash.com", "en", overrideVersionCode = 3),
- SingleLang("MangaClash.tv (unoriginal)", "https://mangaclash.tv", "en", isNsfw = true, className = "MangaClashTv"),
- SingleLang("MangaCrazy", "https://mangacrazy.net", "all", isNsfw = true),
- SingleLang("MangaCultivator", "https://mangacultivator.com", "en", overrideVersionCode = 2),
- SingleLang("MangaCV", "https://mangacv.com", "en", isNsfw = true),
- SingleLang("MangaDeemak", "https://mangadeemak.com", "th", overrideVersionCode = 2),
- SingleLang("MangaDino.top (unoriginal)", "https://mangadino.top", "en", isNsfw = true, className = "MangaDinoTop"),
- SingleLang("MangaEffect", "https://mangaeffect.com", "en", overrideVersionCode = 1),
- SingleLang("Mangaforfree.com", "https://mangaforfree.com", "en", isNsfw = true, className = "Mangaforfreecom", overrideVersionCode = 1),
- SingleLang("MangaFoxFull", "https://mangafoxfull.com", "en"),
- SingleLang("MangaFreak.online", "https://mangafreak.online", "en", className = "MangaFreakOnline"),
- SingleLang("MangaGezgini", "https://mangagezgini.com", "tr"),
- SingleLang("MangaGG", "https://mangagg.com", "en", overrideVersionCode = 2),
- SingleLang("MangaHub.fr", "https://mangahub.fr", "fr", isNsfw = true, className = "MangaHubFr", overrideVersionCode = 2),
- SingleLang("Mangakik", "https://mangakik.org", "en", overrideVersionCode = 2),
- SingleLang("MangaKing", "https://mangaking.net", "en"),
- SingleLang("MangaKitsune", "https://mangakitsune.com", "en", isNsfw = true, overrideVersionCode = 4),
- SingleLang("MangaKomi", "https://mangakomi.io", "en", overrideVersionCode = 5),
- SingleLang("Mangaland", "https://mangaland.net", "es", isNsfw = true),
- SingleLang("MangaLionz", "https://mangalionz.org", "ar", overrideVersionCode = 2),
- SingleLang("MangaManiacs", "https://mangamaniacs.org", "en", isNsfw = true),
- SingleLang("Manganelo.biz", "https://manganelo.biz", "en", isNsfw = true, className = "ManganeloBiz"),
- SingleLang("Manganelo.website (unoriginal)", "https://manganelo.website", "en", isNsfw = true, className = "ManganeloWebsite"),
- SingleLang("MangaOnline.team (unoriginal)", "https://mangaonline.team", "en", className = "MangaOnlineTeamUnoriginal"),
- SingleLang("MangaOwl.blog (unoriginal)", "https://mangaowl.blog", "en", isNsfw = true, className = "MangaOwlBlog"),
- SingleLang("MangaOwl.io (unoriginal)", "https://mangaowl.io", "en", isNsfw = true, className = "MangaOwlIo"),
- SingleLang("MangaOwl.one (unoriginal)", "https://mangaowl.one", "en", isNsfw = true, className = "MangaOwlOne"),
- SingleLang("MangaOwl.us (unoriginal)", "https://mangaowl.us", "en", isNsfw = true, className = "MangaOwlUs"),
- SingleLang("MangaPT", "https://mangapt.com", "es", isNsfw = true),
- SingleLang("MangaPure", "https://mangapure.net", "en", isNsfw = true),
- SingleLang("MangaRabic", "https://mangarabic.com", "ar", overrideVersionCode = 2),
- SingleLang("MangaRead.org", "https://www.mangaread.org", "en", className = "MangaReadOrg", overrideVersionCode = 2),
- SingleLang("MangaRolls", "https://mangarolls.net", "en", overrideVersionCode = 1),
- SingleLang("MangaRosie", "https://mangarosie.in", "en", isNsfw = true),
- SingleLang("MangaRuby.com", "https://mangaruby.com", "en", isNsfw = true, className = "MangaRubyCom"),
- SingleLang("Mangaryu", "https://mangaryu.com", "en", isNsfw = true),
- SingleLang("Mangas No Sekai", "https://mangasnosekai.com", "es", overrideVersionCode = 3),
- SingleLang("Mangas Origines", "https://mangas-origines.xyz", "fr", isNsfw = true, overrideVersionCode = 4),
- SingleLang("Mangas-Origines.fr", "https://mangas-origines.fr", "fr", className = "MangasOriginesFr"),
- SingleLang("MangaSco", "https://manhwasco.net", "en", overrideVersionCode = 2),
- SingleLang("MangaSiro", "https://mangasiro.com", "en", isNsfw = true),
- SingleLang("MangaSpark", "https://mangaspark.org", "ar", overrideVersionCode = 4),
- SingleLang("MangaStic", "https://mangastic9.com", "en", isNsfw = true, overrideVersionCode = 3),
- SingleLang("Mangasushi", "https://mangasushi.org", "en", overrideVersionCode = 3),
- SingleLang("MangaTone", "https://mangatone.com", "en"),
- SingleLang("MangaTop.site", "https://mangatop.site", "all", isNsfw = true, className = "MangaTopSite"),
- SingleLang("MangaToRead", "https://mangatoread.com", "en"),
- SingleLang("MangaTyrant", "https://mangatyrant.com", "en"),
- SingleLang("MangaUpdates.top (unoriginal)", "https://mangaupdates.top", "en", isNsfw = true, className = "MangaUpdatesTop"),
- SingleLang("MangaUS", "https://mangaus.xyz", "en", overrideVersionCode = 2),
- SingleLang("MangaVisa", "https://mangavisa.com", "en", pkgName = "mangaboss", className = "MangaVisa", overrideVersionCode = 1),
- SingleLang("MangaWOW", "https://mangawow.org", "tr"),
- SingleLang("MangaX1", "https://mangax1.com", "en"),
- SingleLang("Mangaxico", "https://mangaxico.com", "es", isNsfw = true),
- SingleLang("MangaXP", "https://mangaxp.com", "en", overrideVersionCode = 1),
- SingleLang("MangaYami", "https://www.mangayami.club", "en", overrideVersionCode = 2),
- SingleLang("Mangá Nanquim", "https://mangananquim.com", "pt-BR", className = "MangaNanquim"),
- SingleLang("Manhastro", "https://manhastro.com", "pt-BR"),
- SingleLang("Manhatic", "https://manhatic.com", "ar", isNsfw = true),
- SingleLang("Manhua AZ", "https://manhuaaz.com", "en"),
- SingleLang("Manhua ES", "https://manhuaes.com", "en", overrideVersionCode = 6),
- SingleLang("Manhua Fenix", "https://visorfenix.com", "es", className = "ManhuaFenix", pkgName = "mangafenix", overrideVersionCode = 4),
- SingleLang("Manhua Kiss", "https://manhuakiss.com", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Manhua Mix", "https://manhuamix.com", "en", className = "Manhuasnet", overrideVersionCode = 3),
- SingleLang("Manhua Plus", "https://manhuaplus.com", "en", overrideVersionCode = 6),
- SingleLang("Manhua SY", "https://www.manhuasy.com", "en", overrideVersionCode = 2),
- SingleLang("Manhua Zonghe", "https://manhuazonghe.com", "en", isNsfw = true),
- SingleLang("ManhuaBox", "https://manhuabox.net", "en", overrideVersionCode = 2),
- SingleLang("ManhuaChill", "https://manhuachill.com", "en"),
- SingleLang("ManhuaDex", "https://manhuadex.com", "en"),
- SingleLang("ManhuaFast", "https://manhuafast.com", "en", overrideVersionCode = 3),
- SingleLang("ManhuaFast.net (unoriginal)", "https://manhuafast.net", "en", className = "ManhuaFastNet"),
- SingleLang("Manhuaga", "https://manhuaga.com", "en", overrideVersionCode = 2),
- SingleLang("ManhuaHot", "https://manhuahot.com", "en"),
- SingleLang("ManhuaManhwa", "https://manhuamanhwa.com", "en", isNsfw = true),
- SingleLang("ManhuaManhwa.online", "https://manhuamanhwa.online", "en", className = "ManhuaManhwaOnline"),
- SingleLang("ManhuaScan.info (unoriginal)", "https://manhuascan.info", "en", isNsfw = true, className = "ManhuaScanInfo"),
- SingleLang("ManhuaUS", "https://manhuaus.com", "en", overrideVersionCode = 5),
- SingleLang("ManhuaZone", "https://manhuazone.org", "en", overrideVersionCode = 1),
- SingleLang("Manhwa Raw", "https://manhwaraw.com", "ko", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Manhwa-Latino", "https://manhwa-latino.com", "es", isNsfw = true, className = "ManhwaLatino", overrideVersionCode = 7),
- SingleLang("Manhwa-raw", "https://manhwa-raw.com", "all", isNsfw = true, className = "ManhwaDashRaw", overrideVersionCode = 1),
- SingleLang("Manhwa18.app", "https://manhwa18.app", "en", isNsfw = true, className = "Manhwa18app"),
- SingleLang("Manhwa18.org", "https://manhwa18.org", "en", isNsfw = true, className = "Manhwa18Org", overrideVersionCode = 2),
- SingleLang("Manhwa2Read", "https://manhwa2read.com", "en"),
- SingleLang("Manhwa365", "https://manhwa365.com", "en", isNsfw = true),
- SingleLang("Manhwa68", "https://manhwa68.com", "en", isNsfw = true, overrideVersionCode = 3),
- SingleLang("ManhwaBookShelf", "https://manhwabookshelf.com", "en"),
- SingleLang("ManhwaClan", "https://manhwaclan.com", "en"),
- SingleLang("Manhwafull", "https://manhwafull.com", "en", overrideVersionCode = 1),
- SingleLang("Manhwahentai.me", "https://manhwahentai.me", "en", className = "ManhwahentaiMe", isNsfw = true, overrideVersionCode = 3),
- SingleLang("ManhwaManhua", "https://manhwamanhua.com", "en", isNsfw = true),
- SingleLang("ManhwaNew", "https://manhwanew.com", "en", isNsfw = true),
- SingleLang("Manhwas Men", "https://manhwas.men", "en", isNsfw = true),
- SingleLang("Manhwatop", "https://manhwatop.com", "en", overrideVersionCode = 2),
- SingleLang("ManhwaZ", "https://manhwaz.com", "en", isNsfw = true),
- SingleLang("Manhwua.fans", "https://manhwua.fans", "en", isNsfw = true, className = "Manhwuafans"),
- SingleLang("Mantraz Scan", "https://mantrazscan.com", "es"),
- SingleLang("ManWe", "https://manwe.pro", "tr", className = "EvaScans", overrideVersionCode = 1),
- SingleLang("ManyComic", "https://manycomic.com", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("ManyToon", "https://manytoon.com", "en", isNsfw = true, overrideVersionCode = 5),
- SingleLang("ManyToon.me", "https://manytoon.me", "en", isNsfw = true, className = "ManyToonMe", overrideVersionCode = 5),
- SingleLang("ManyToonClub", "https://manytoon.club", "ko", isNsfw = true, overrideVersionCode = 2),
- SingleLang("MG Komik", "https://mgkomik.id", "id", overrideVersionCode = 12),
- SingleLang("MHScans", "https://mhscans.com", "es"),
- SingleLang("Midnight Mess Scans", "https://midnightmess.org", "en", isNsfw = true, overrideVersionCode = 6),
- SingleLang("MidnightManga", "http://midnightmanga.com", "es"),
- SingleLang("Milftoon", "https://milftoon.xxx", "en", isNsfw = true, overrideVersionCode = 2),
- SingleLang("MiniTwo Scan", "https://minitwoscan.com", "pt-BR"),
- SingleLang("MMScans", "https://mm-scans.org", "en", overrideVersionCode = 7),
- SingleLang("Momo no Hana Scan", "https://momonohanascan.com", "pt-BR", className = "MomoNoHanaScan", overrideVersionCode = 1),
- SingleLang("MonarcaManga", "https://monarcamanga.com", "es"),
- SingleLang("Moon Witch In Love", "https://moonwitchinlovescan.com", "pt-BR"),
- SingleLang("MoonLovers Scan", "https://moonloversscan.com.br", "pt-BR", isNsfw = true),
- SingleLang("Mortals Groove", "https://mortalsgroove.com", "en", overrideVersionCode = 1),
- SingleLang("MR Yaoi Fansub", "https://mrbenne.com", "pt-BR", isNsfw = true, className = "MrYaoiFansub", overrideVersionCode = 1),
- SingleLang("Muctau", "https://bibimanga.com", "en", isNsfw = true, overrideVersionCode = 4),
- SingleLang("MurimScan", "https://murimscan.run", "en", isNsfw = true),
- SingleLang("My Manhwa", "https://mymanhwa.net", "en"),
- SingleLang("Mystical Merries", "https://mysticalmerries.com", "en", overrideVersionCode = 2),
- SingleLang("NeatManga", "https://neatmanga.com", "en", overrideVersionCode = 2),
- SingleLang("NekoPost.co (unoriginal)", "https://www.nekopost.co", "th", className = "NekoPostCo"),
- SingleLang("NekoScan", "https://nekoscan.com", "en", overrideVersionCode = 2),
- SingleLang("Neroxus", "https://neroxus.com.br", "pt-BR", className = "ImperioScans", pkgName = "imperioscans", overrideVersionCode = 3),
- SingleLang("NewManhua", "https://newmanhua.com", "en", isNsfw = true),
- SingleLang("Nexo Scans", "https://nexoscans.com", "pt-BR", overrideVersionCode = 1),
- SingleLang("Night Comic", "https://www.nightcomic.com", "en", overrideVersionCode = 1),
- SingleLang("Niji Translations", "https://niji-translations.com", "ar", overrideVersionCode = 1),
- SingleLang("Ninja Scan", "https://ninjascan.site", "pt-BR"),
- SingleLang("Nitro Manga", "https://nitromanga.com", "en", className = "NitroScans", overrideVersionCode = 1),
- SingleLang("Norte Rose Scan", "https://norterose.com.br", "pt-BR", isNsfw = true),
- SingleLang("No Index Scan", "https://noindexscan.com", "pt-BR", isNsfw = true),
- SingleLang("Noblesse Translations", "https://www.noblessev1.com", "es", overrideVersionCode = 2),
- SingleLang("Nocturne Summer", "https://nocsummer.com.br", "pt-BR", isNsfw = true),
- SingleLang("NovelCrow", "https://novelcrow.com", "en", isNsfw = true),
- SingleLang("NovelMic", "https://novelmic.com", "en", overrideVersionCode = 1),
- SingleLang("Novels Town", "https://novelstown.cyou", "ar"),
- SingleLang("Oh No Manga", "https://ohnomanga.com", "en", isNsfw = true),
- SingleLang("Olaoe", "https://olaoe.cyou", "ar"),
- SingleLang("OnlyManhwa", "https://onlymanhwa.org", "en", isNsfw = true),
- SingleLang("OPSCANS", "https://opchapters.com", "en"),
- SingleLang("Pantheon Scan", "https://pantheon-scan.com", "fr", overrideVersionCode = 1),
- SingleLang("Paragon Scans", "https://paragonscans.com", "en", isNsfw = true),
- SingleLang("Passa Mão Scan", "https://passamaoscan.com", "pt-BR", isNsfw = true, className = "PassaMaoScan"),
- SingleLang("Paw Manga", "https://pawmanga.com", "en", isNsfw = true),
- SingleLang("Petrotechsociety", "https://www.petrotechsociety.org", "en", isNsfw = true),
- SingleLang("Pian Manga", "https://pianmanga.me", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Pink Sea Unicorn", "https://psunicorn.com", "pt-BR", isNsfw = true),
- SingleLang("Pirulito Rosa", "https://pirulitorosa.site", "pt-BR", isNsfw = true),
- SingleLang("Platinum Crown", "https://platinumscans.com", "en", overrideVersionCode = 1),
- SingleLang("PMScans", "https://rackusreads.com", "en"),
- SingleLang("Pojok Manga", "https://pojokmanga.net", "id", overrideVersionCode = 5),
- SingleLang("PoManga", "https://pomanga.com", "en"),
- SingleLang("Pony Manga", "https://ponymanga.com", "en", isNsfw = true),
- SingleLang("PornComix", "https://www.porncomixonline.net", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Pornhwa18", "https://pornhwa18.com", "id", isNsfw = true),
- SingleLang("Pornwha", "https://pornwha.com", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Portal Yaoi", "https://portalyaoi.com", "pt-BR", isNsfw = true),
- SingleLang("Prisma Hentais", "https://prismahentai.com", "pt-BR", isNsfw = true),
- SingleLang("Ragnarok Scanlation", "https://ragnarokscanlation.net", "es", overrideVersionCode = 1),
- SingleLang("RagnarokScan", "https://ragnarokscan.com", "es", overrideVersionCode = 1),
- SingleLang("Raijin Scans", "https://raijinscans.fr", "fr"),
- SingleLang("Rainbow Fairy Scan", "https://rainbowfairyscan.com", "pt-BR"),
- SingleLang("RawDEX", "https://rawdex.net", "ko", isNsfw = true, overrideVersionCode = 1),
- SingleLang("ReaderGen", "https://fr.readergen.fr", "fr"),
- SingleLang("ReadFreeComics", "https://readfreecomics.com", "en"),
- SingleLang("ReadMangaFree", "https://readmangafree.net", "en", isNsfw = true),
- SingleLang("ReadManhua", "https://readmanhua.net", "en", overrideVersionCode = 2),
- SingleLang("Reaper Scans", "https://reaperscans.fr", "fr"),
- SingleLang("Reset Scans", "https://reset-scans.us", "en"),
- SingleLang("Rh2PlusManga", "https://www.rh2plusmanga.com", "th", isNsfw = true, overrideVersionCode = 5),
- SingleLang("RichtoScan", "https://richtoscan.com", "es"),
- SingleLang("Rightdark Scan", "https://rightdark-scan.com", "es"),
- SingleLang("Rio2 Manga", "https://rio2manga.net", "en", overrideVersionCode = 1),
- SingleLang("ROG Mangás", "https://rogmangas.com", "pt-BR", pkgName = "mangasoverall", className = "RogMangas", overrideVersionCode = 1),
- SingleLang("Romantik Manga", "https://romantikmanga.com", "tr"),
- SingleLang("Rüya Manga", "https://www.ruyamanga.com", "tr", className = "RuyaManga", overrideVersionCode = 1),
- SingleLang("S2Manga", "https://www.s2manga.com", "en", overrideVersionCode = 2),
- SingleLang("Sagrado Império da Britannia", "https://imperiodabritannia.com", "pt-BR", className = "ImperioDaBritannia"),
- SingleLang("SamuraiScan", "https://samuraiscan.org", "es", overrideVersionCode = 4),
- SingleLang("Sawamics", "https://sawamics.com", "en"),
- SingleLang("ScamberTraslator", "https://scambertraslator.com", "es", overrideVersionCode = 3),
- SingleLang("Scan Hentai FR", "https://scan-hentai.fr", "fr", isNsfw = true),
- SingleLang("Scan Hentai Menu", "https://scan.hentai.menu", "fr", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Sdl scans", "https://sdlscans.com", "es", className = "SdlScans"),
- SingleLang("SectScans", "https://sectscans.com", "en"),
- SingleLang("Setsu Scans", "https://setsuscans.com", "en", overrideVersionCode = 2),
- SingleLang("Shadowtrad", "https://shadowtrad.net", "fr"),
- SingleLang("ShavelProiection", "https://www.shavelproiection.com", "it", true),
- SingleLang("Shayami", "https://shayami.com", "es"),
- SingleLang("Shiba Manga", "https://shibamanga.com", "en"),
- SingleLang("Shield Manga", "https://shieldmanga.io", "en", overrideVersionCode = 3),
- SingleLang("Shinigami", "https://shinigamitoon.com", "id", overrideVersionCode = 16),
- SingleLang("Shooting Star Scans", "https://shootingstarscans.com", "en"),
- SingleLang("ShoujoHearts", "https://shoujohearts.com", "en", overrideVersionCode = 2),
- SingleLang("Sinensis Scan", "https://sinensisscan.net", "pt-BR", pkgName = "sinensis", overrideVersionCode = 6),
- SingleLang("SISI GELAP", "https://sigel.asia", "id", overrideVersionCode = 4),
- SingleLang("SkyManga.xyz", "https://skymanga.xyz", "en", isNsfw = true, className = "SkyMangaXyz"),
- SingleLang("Sleepy Translations", "https://sleepytranslations.com", "en", overrideVersionCode = 1),
- SingleLang("Solo Leveling", "https://readsololeveling.online", "en"),
- SingleLang("StoneScape", "https://stonescape.xyz", "en"),
- SingleLang("Sugar Babies", "https://sugarbbscan.com", "en", overrideVersionCode = 2),
- SingleLang("Summanga", "https://summanga.com", "en", isNsfw = true),
- SingleLang("Sunshine Butterfly Scans", "https://sunshinebutterflyscan.com", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Sussy Scan", "https://sussyscan.com", "pt-BR"),
- SingleLang("Sweet Time Scan", "https://sweetscan.net", "pt-BR", overrideVersionCode = 2),
- SingleLang("Tankou Hentai", "https://tankouhentai.com", "pt-BR", isNsfw = true),
- SingleLang("TappyToon.Net", "https://tappytoon.net", "en", className = "Tappytoonnet"),
- SingleLang("Tatakae Scan", "https://tatakaescan.com", "pt-BR", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Taurus Fansub", "https://taurusmanga.com", "es", overrideVersionCode = 1),
- SingleLang("TeenManhua", "https://teenmanhua.com", "en", overrideVersionCode = 1),
- SingleLang("TenkaiScan", "https://tenkaiscan.net", "es", isNsfw = true),
- SingleLang("The Beginning After The End", "https://www.thebeginningaftertheend.fr", "fr", overrideVersionCode = 1),
- SingleLang("The Blank Scanlation", "https://theblank.net", "en", className = "TheBlank", isNsfw = true),
- SingleLang("The Guild", "https://theguildscans.com", "en"),
- SingleLang("Time Naight", "https://timenaight.com", "tr"),
- SingleLang("Todaymic", "https://todaymic.com", "en", overrideVersionCode = 1),
- SingleLang("TonizuToon", "https://tonizu.com", "tr", isNsfw = true, overrideVersionCode = 1),
- SingleLang("ToonChill", "https://toonchill.com", "en", overrideVersionCode = 1),
- SingleLang("ToonGod", "https://www.toongod.org", "en", isNsfw = true, overrideVersionCode = 5),
- SingleLang("Toonily", "https://toonily.com", "en", isNsfw = true, overrideVersionCode = 11),
- SingleLang("Toonizy", "https://toonizy.com", "en", isNsfw = true),
- SingleLang("ToonMany", "https://toonmany.com", "en", isNsfw = true),
- SingleLang("Top Manhua", "https://topmanhua.com", "en", overrideVersionCode = 3),
- SingleLang("TopReadManhwa", "https://topreadmanhwa.com", "en", isNsfw = true),
- SingleLang("Tortuga Ceviri", "https://tortuga-ceviri.com", "tr"),
- SingleLang("Traducciones Moonlight", "https://traduccionesmoonlight.com", "es"),
- SingleLang("TreeManga", "https://treemanga.com", "en", overrideVersionCode = 1),
- SingleLang("TritiniaScans", "https://tritinia.org", "en", overrideVersionCode = 4),
- SingleLang("Tumangaonline.site", "https://tumangaonline.site", "es", isNsfw = true, className = "TumangaonlineSite"),
- SingleLang("Unitoon Oficial", "https://unitoonoficial.com", "es"),
- SingleLang("Unitoon", "https://lectorunitoon.com", "es"),
- SingleLang("Valkyrie Scan", "https://valkyriescan.com", "pt-BR", isNsfw = true),
- SingleLang("Ver Manhwas", "https://vermanhwa.es", "es", isNsfw = true, overrideVersionCode = 1),
- SingleLang("VinManga", "https://vinload.com", "en", isNsfw = true),
- SingleLang("Wakamics", "https://wakamics.net", "en"),
- SingleLang("Webdex Scans", "https://webdexscans.com", "en"),
- SingleLang("Webtoon City", "https://webtooncity.com", "en"),
- SingleLang("Webtoon Hatti", "https://webtoonhatti.net", "tr", overrideVersionCode = 2),
- SingleLang("Webtoon TR", "https://webtoontr.net", "tr", isNsfw = true, overrideVersionCode = 2),
- SingleLang("WebToonily", "https://webtoonily.com", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("WebtoonScan", "https://webtoonscan.com", "en", isNsfw = true),
- SingleLang("WebtoonsTOP", "https://webtoons.top", "en", isNsfw = true),
- SingleLang("WebtoonUK", "https://webtoon.uk", "en", overrideVersionCode = 2),
- SingleLang("WebtoonXYZ", "https://www.webtoon.xyz", "en", isNsfw = true, overrideVersionCode = 3),
- SingleLang("Whale Manga", "https://whalemanga.com", "en", isNsfw = true),
- SingleLang("Winter Scan", "https://winterscan.com", "pt-BR", overrideVersionCode = 4),
- SingleLang("Wonderland Scan", "https://wonderlandscan.com", "pt-BR", overrideVersionCode = 3),
- SingleLang("WoopRead", "https://woopread.com", "en", overrideVersionCode = 1),
- SingleLang("WorldManhwas", "https://worldmanhwas.zone", "id", isNsfw = true, overrideVersionCode = 3),
- SingleLang("WuxiaWorld", "https://wuxiaworld.site", "en", overrideVersionCode = 1),
- SingleLang("YANP Fansub", "https://yanpfansub.com", "pt-BR", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Yaoi Comics", "https://ycscan.com", "pt-BR", isNsfw = true),
- SingleLang("Yaoi Hentai", "https://yaoihentai.me", "en", isNsfw = true),
- SingleLang("Yaoi.mobi", "https://yaoi.mobi", "en", isNsfw = true, className = "YaoiManga", overrideVersionCode = 4),
- SingleLang("YaoiScan", "https://yaoiscan.com", "en", isNsfw = true),
- SingleLang("YaoiToon", "https://yaoitoon.com", "en", isNsfw = true),
- SingleLang("YonaBar", "https://yonabar.com", "ar", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Yuri Verso", "https://yuri.live", "pt-BR", overrideVersionCode = 3),
- SingleLang("Zandy no Fansub", "https://zandynofansub.aishiteru.org", "en"),
- SingleLang("ZinChanManga", "https://zinchanmanga.net", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Zinmanga", "https://zinmanga.com", "en", overrideVersionCode = 1),
- SingleLang("ZuttoManga", "https://zuttomanga.com", "en", overrideVersionCode = 1),
- SingleLang("Çizgi Roman Arşivi", "https://cizgiromanarsivi.com", "tr", className = "CizgiRomanArsivi"),
- SingleLang("Detective Conan Ar", "https://manga.detectiveconanar.com", "ar", sourceName = "شبكة كونان العربية", overrideVersionCode = 2),
- SingleLang("Arab Toons", "https://arabtoons.net", "ar", isNsfw = true, sourceName = "عرب تونز"),
- SingleLang("Comic Arab", "https://comicarab.com", "ar", isNsfw = true, sourceName = "كوميك العرب"),
- SingleLang("3asq", "https://3asq.org", "ar", className = "Manga3asq", sourceName = "مانجا العاشق", overrideVersionCode = 2),
- SingleLang("Mangalek", "https://manga-lek.net", "ar", sourceName = "مانجا ليك", overrideVersionCode = 4),
- SingleLang("Mangalink", "https://manga-link.com", "ar", sourceName = "ﻣﺎﻧﺠﺎ لينك", overrideVersionCode = 1),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MadaraGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madtheme/MadThemeGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madtheme/MadThemeGenerator.kt
deleted file mode 100644
index 0eacbeee2..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madtheme/MadThemeGenerator.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.madtheme
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MadThemeGenerator : ThemeSourceGenerator {
-
- override val themePkg = "madtheme"
-
- override val themeClass = "MadTheme"
-
- override val baseVersionCode: Int = 13
-
- override val sources = listOf(
- SingleLang("BeeHentai", "https://beehentai.com", "en", isNsfw = true),
- SingleLang("BoxManhwa", "https://boxmanhwa.com", "en", isNsfw = true),
- SingleLang("MangaBuddy", "https://mangabuddy.com", "en", isNsfw = true, overrideVersionCode = 2),
- SingleLang("MangaCute", "https://mangacute.com", "en", isNsfw = true),
- SingleLang("MangaForest", "https://mangaforest.me", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("MangaPuma", "https://mangapuma.com", "en", isNsfw = true, overrideVersionCode = 2),
- SingleLang("MangaXYZ", "https://mangaxyz.com", "en", isNsfw = true),
- SingleLang("Toonily.me", "https://toonily.me", "en", isNsfw = true, className = "ToonilyMe"),
- SingleLang("TooniTube", "https://toonitube.com", "en", isNsfw = true),
- SingleLang("TrueManga", "https://truemanga.com", "en", isNsfw = true),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MadThemeGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/makaru/MakaruGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/makaru/MakaruGenerator.kt
deleted file mode 100644
index c02e9bed6..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/makaru/MakaruGenerator.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.makaru
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MakaruGenerator : ThemeSourceGenerator {
-
- override val themePkg = "makaru"
-
- override val themeClass = "Makaru"
-
- override val baseVersionCode = 1
-
- override val sources = listOf(
- SingleLang("KomikGes", "https://www.komikges.my.id", "id"),
- SingleLang("ReYume", "https://www.re-yume.my.id", "id", pkgName = "inazumanga", overrideVersionCode = 34),
- SingleLang("YuraManga", "https://www.yuramanga.my.id", "id"),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MakaruGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/manga18/Manga18Generator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/manga18/Manga18Generator.kt
deleted file mode 100644
index 76712cff2..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/manga18/Manga18Generator.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.manga18
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class Manga18Generator : ThemeSourceGenerator {
-
- override val themePkg = "manga18"
-
- override val themeClass = "Manga18"
-
- override val baseVersionCode = 1
-
- override val sources = listOf(
- SingleLang("18 Porn Comic", "https://18porncomic.com", "en", isNsfw = true, className = "EighteenPornComic"),
- SingleLang("Comic1000", "https://comic1000.com", "en", isNsfw = true),
- SingleLang("HANMAN18", "https://hanman18.com", "zh", isNsfw = true),
- SingleLang("Hentai3z.CC", "https://hentai3z.cc", "en", isNsfw = true, className = "Hentai3zCC"),
- SingleLang("Manga18.Club", "https://manga18.club", "en", isNsfw = true, className = "Manga18Club"),
- SingleLang("TuManhwas.Club", "https://tumanhwas.club", "es", isNsfw = true, className = "TuManhwasClub"),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- Manga18Generator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBoxGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBoxGenerator.kt
deleted file mode 100644
index 6fadf8401..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBoxGenerator.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.mangabox
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MangaBoxGenerator : ThemeSourceGenerator {
-
- override val themePkg = "mangabox"
-
- override val themeClass = "MangaBox"
-
- override val baseVersionCode: Int = 5
-
- override val sources = listOf(
- SingleLang("Mangakakalot", "https://mangakakalot.com", "en", overrideVersionCode = 3),
- SingleLang("Manganato", "https://manganato.com", "en", overrideVersionCode = 2, pkgName = "manganelo"),
- SingleLang("Mangabat", "https://m.mangabat.com", "en", overrideVersionCode = 4),
- SingleLang("Mangakakalots (unoriginal)", "https://mangakakalots.com", "en", overrideVersionCode = 1, className = "Mangakakalots", pkgName = "mangakakalots"),
- SingleLang("Mangairo", "https://h.mangairo.com", "en", isNsfw = true, overrideVersionCode = 4),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MangaBoxGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalogGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalogGenerator.kt
deleted file mode 100644
index ec7dc2bfa..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalogGenerator.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.mangacatalog
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MangaCatalogGenerator : ThemeSourceGenerator {
-
- override val themePkg = "mangacatalog"
-
- override val themeClass = "MangaCatalog"
-
- override val baseVersionCode: Int = 4
-
- override val sources = listOf(
- SingleLang("Read Attack on Titan Shingeki no Kyojin Manga", "https://ww8.readsnk.com", "en", className = "ReadAttackOnTitanShingekiNoKyojinManga", overrideVersionCode = 4),
- SingleLang("Read Berserk Manga", "https://readberserk.com", "en"),
- SingleLang("Read Black Clover Manga Online", "https://ww7.readblackclover.com", "en"),
- SingleLang("Read Boku no Hero Academia My Hero Academia Manga", "https://ww6.readmha.com", "en", className = "ReadBokuNoHeroAcademiaMyHeroAcademiaManga", overrideVersionCode = 2),
- SingleLang("Read Chainsaw Man Manga Online", "https://ww1.readchainsawman.com", "en"),
- SingleLang("Read Dr. Stone Manga Online", "https://ww3.readdrstone.com", "en", className = "ReadDrStoneMangaOnline"),
- SingleLang("Read Dragon Ball Super Chou Manga Online", "https://ww6.dbsmanga.com", "en", overrideVersionCode = 1),
- SingleLang("Read Fairy Tail & Edens Zero Manga Online", "https://ww4.readfairytail.com", "en", className = "ReadFairyTailEdensZeroMangaOnline", overrideVersionCode = 1),
- SingleLang("Read Goblin Slayer Manga Online", "https://manga.watchgoblinslayer.com", "en"),
- SingleLang("Read Haikyuu!! Manga Online", "https://ww6.readhaikyuu.com", "en", className = "ReadHaikyuuMangaOnline"),
- SingleLang("Read Hunter x Hunter Manga Online", "https://ww2.readhxh.com", "en", overrideVersionCode = 1),
- SingleLang("Read Jujutsu Kaisen Manga Online", "https://ww1.readjujutsukaisen.com", "en", overrideVersionCode = 1),
- SingleLang("Read Kaguya-sama Manga Online", "https://ww1.readkaguyasama.com", "en", className = "ReadKaguyaSamaMangaOnline", overrideVersionCode = 1),
- SingleLang("Read Kingdom Manga Online", "https://ww2.readkingdom.com", "en"),
- SingleLang("Read Nanatsu no Taizai 7 Deadly Sins Manga Online", "https://ww3.read7deadlysins.com", "en", className = "ReadNanatsuNoTaizai7DeadlySinsMangaOnline", overrideVersionCode = 2),
- SingleLang("Read Naruto Boruto Samurai 8 Manga Online", "https://ww7.readnaruto.com", "en", overrideVersionCode = 1),
- SingleLang("Read Noblesse Manhwa Online", "https://ww2.readnoblesse.com", "en"),
- SingleLang("Read One Piece Manga Online", "https://ww8.readonepiece.com", "en"),
- SingleLang("Read One-Punch Man Manga Online", "https://ww3.readopm.com", "en", className = "ReadOnePunchManMangaOnlineTwo", overrideVersionCode = 1), // exact same name as the one in mangamainac extension
- SingleLang("Read Solo Leveling Manga Manhwa Online", "https://readsololeveling.org", "en", overrideVersionCode = 2),
- SingleLang("Read The Promised Neverland Manga Online", "https://ww3.readneverland.com", "en", overrideVersionCode = 1),
- SingleLang("Read Tokyo Ghoul Re & Tokyo Ghoul Manga Online", "https://ww8.tokyoghoulre.com", "en", className = "ReadTokyoGhoulReTokyoGhoulMangaOnline", overrideVersionCode = 1),
- SingleLang("Read Tower of God Manhwa Manga Online", "https://ww1.readtowerofgod.com", "en", className = "ReadTowerOfGodManhwaMangaOnline", overrideVersionCode = 2),
- SingleLang("Read Vinland Saga Manga Online", "https://ww1.readvinlandsaga.com", "en"),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MangaCatalogGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureGenerator.kt
deleted file mode 100644
index 02af19243..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureGenerator.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.mangadventure
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-/** [MangAdventure] source generator. */
-class MangAdventureGenerator : ThemeSourceGenerator {
- override val themePkg = "mangadventure"
-
- override val themeClass = "MangAdventure"
-
- override val baseVersionCode = 13
-
- override val sources = listOf(
- SingleLang("Arc-Relight", "https://arc-relight.com", "en", className = "ArcRelight"),
- SingleLang("Assorted Scans", "https://assortedscans.com", "en", overrideVersionCode = 2),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) = MangAdventureGenerator().createAll()
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangahub/MangaHubGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangahub/MangaHubGenerator.kt
deleted file mode 100644
index 9042dc1f4..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangahub/MangaHubGenerator.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.mangahub
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MangaHubGenerator : ThemeSourceGenerator {
-
- override val themePkg = "mangahub"
-
- override val themeClass = "MangaHub"
-
- override val baseVersionCode: Int = 27
-
- override val sources = listOf(
- SingleLang("1Manga.co", "https://1manga.co", "en", isNsfw = true, className = "OneMangaCo"),
- SingleLang("MangaFox.fun", "https://mangafox.fun", "en", isNsfw = true, className = "MangaFoxFun"),
- SingleLang("MangaHere.onl", "https://mangahere.onl", "en", isNsfw = true, className = "MangaHereOnl"),
- SingleLang("MangaHub", "https://mangahub.io", "en", isNsfw = true, overrideVersionCode = 10, className = "MangaHubIo"),
- SingleLang("Mangakakalot.fun", "https://mangakakalot.fun", "en", isNsfw = true, className = "MangakakalotFun"),
- SingleLang("MangaNel", "https://manganel.me", "en", isNsfw = true),
- SingleLang("MangaOnline.fun", "https://mangaonline.fun", "en", isNsfw = true, className = "MangaOnlineFun"),
- SingleLang("MangaPanda.onl", "https://mangapanda.onl", "en", className = "MangaPandaOnl"),
- SingleLang("MangaReader.site", "https://mangareader.site", "en", className = "MangaReaderSite"),
- SingleLang("MangaToday", "https://mangatoday.fun", "en", isNsfw = true),
- SingleLang("OneManga.info", "https://onemanga.info", "en", isNsfw = true, className = "OneMangaInfo"), // Some chapters link to 1manga.co, hard to filter
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MangaHubGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangaraw/MangaRawGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangaraw/MangaRawGenerator.kt
deleted file mode 100644
index afc41109e..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangaraw/MangaRawGenerator.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.mangaraw
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MangaRawGenerator : ThemeSourceGenerator {
- override val themeClass = "MangaRawTheme"
-
- override val themePkg = "mangaraw"
-
- override val baseVersionCode = 5
-
- override val sources = listOf(
- SingleLang("SyoSetu", "https://syosetu.top", "ja"),
- SingleLang("MangaRaw", "https://manga1001.in", "ja", pkgName = "manga9co", isNsfw = true, overrideVersionCode = 2),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MangaRawGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangareader/MangaReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangareader/MangaReaderGenerator.kt
deleted file mode 100644
index ca321e107..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangareader/MangaReaderGenerator.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.mangareader
-
-import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MangaReaderGenerator : ThemeSourceGenerator {
- override val themeClass = "MangaReader"
- override val themePkg = "mangareader"
- override val baseVersionCode = 1
- override val sources = listOf(
- MultiLang(
- name = "MangaReader",
- baseUrl = "https://mangareader.to",
- langs = listOf("en", "fr", "ja", "ko", "zh"),
- isNsfw = true,
- pkgName = "mangareaderto",
- overrideVersionCode = 3,
- ),
- MultiLang(
- name = "MangaFire",
- baseUrl = "https://mangafire.to",
- langs = listOf("en", "es", "es-419", "fr", "ja", "pt", "pt-BR"),
- isNsfw = true,
- overrideVersionCode = 3,
- ),
- SingleLang(
- name = "Manhuagold",
- baseUrl = "https://manhuagold.com",
- lang = "en",
- isNsfw = true,
- className = "Manhuagold",
- pkgName = "comickiba",
- overrideVersionCode = 33,
- ),
- SingleLang(
- name = "Raw Otaku",
- baseUrl = "https://rawotaku.com",
- lang = "ja",
- isNsfw = true,
- ),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MangaReaderGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt
deleted file mode 100644
index 561605b23..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt
+++ /dev/null
@@ -1,183 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.mangathemesia
-
-import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-// Formerly WPMangaStream & WPMangaReader -> MangaThemesia
-class MangaThemesiaGenerator : ThemeSourceGenerator {
-
- override val themePkg = "mangathemesia"
-
- override val themeClass = "MangaThemesia"
-
- override val baseVersionCode: Int = 28
-
- override val sources = listOf(
- MultiLang("Miau Scan", "https://miaucomics.org", listOf("es", "pt-BR"), overrideVersionCode = 2),
- MultiLang("Thunder Scans", "https://thunderscans.com", listOf("ar", "en")),
- SingleLang("Ainz Scans ID", "https://ainzscans.net", "id", overrideVersionCode = 1),
- SingleLang("Alceascan", "https://alceascan.my.id", "id"),
- SingleLang("Animated Glitched Comics", "https://agscomics.com", "en"),
- SingleLang("Animated Glitched Scans", "https://anigliscans.xyz", "en", overrideVersionCode = 1),
- SingleLang("ARESManga", "https://en-aresmanga.com", "ar", pkgName = "iimanga", className = "ARESManga", overrideVersionCode = 2),
- SingleLang("ARESNOV", "https://aresnov.org", "ar"),
- SingleLang("Arven Scans", "https://arvenscans.com", "en"),
- SingleLang("AscalonScans", "https://ascalonscans.com", "en", overrideVersionCode = 1),
- SingleLang("Asura Scans", "https://asuratoon.com", "en", overrideVersionCode = 1),
- SingleLang("Atlantis Scan", "https://scansatlanticos.com", "es", isNsfw = true, overrideVersionCode = 6),
- SingleLang("Banana-Scan", "https://banana-scan.com", "fr", className = "BananaScan", isNsfw = true),
- SingleLang("Beast Scans", "https://beastscans.net", "ar", overrideVersionCode = 1),
- SingleLang("Berserker Scan", "https://ragnascan.com", "es"),
- SingleLang("BirdManga", "https://birdmanga.com", "en"),
- SingleLang("Boosei", "https://boosei.net", "id", overrideVersionCode = 2),
- SingleLang("Cartel de Manhwas", "https://carteldemanhwas.com", "es", overrideVersionCode = 6),
- SingleLang("Comicaso", "https://comicaso.com", "id"),
- SingleLang("Comicsekai", "http://www.comicsekai.com", "id"),
- SingleLang("Constellar Scans", "https://constellarcomic.com", "en", isNsfw = true, overrideVersionCode = 16),
- SingleLang("Cosmic Scans", "https://cosmic-scans.com", "en", overrideVersionCode = 2),
- SingleLang("CosmicScans.id", "https://cosmicscans.id", "id", overrideVersionCode = 3, className = "CosmicScansID"),
- SingleLang("CulturedWorks", "https://culturedworks.com", "en", isNsfw = true),
- SingleLang("Cypher Scans", "https://cypherscans.xyz", "en"),
- SingleLang("Diskus Scan", "https://diskusscan.com", "pt-BR", overrideVersionCode = 9),
- SingleLang("Dojing.net", "https://dojing.net", "id", isNsfw = true, className = "DojingNet"),
- SingleLang("Dragon-Manga", "https://www.dragon-manga.com", "th", isNsfw = true, className = "DragonManga"),
- SingleLang("Elarc Toon", "https://elarctoon.com", "en", className = "ElarcPage", overrideVersionCode = 2),
- SingleLang("EnryuManga", "https://enryumanga.com", "en"),
- SingleLang("Epsilon Scan", "https://epsilonscan.fr", "fr", isNsfw = true),
- SingleLang("Evil production", "https://evil-manga.eu", "cs", isNsfw = true),
- SingleLang("Fairy Manga", "https://fairymanga.com", "en", className = "QueenScans", overrideVersionCode = 1),
- SingleLang("Flame Comics", "https://flamecomics.com", "en"),
- SingleLang("Franxx Mangás", "https://franxxmangas.net", "pt-BR", className = "FranxxMangas", isNsfw = true),
- SingleLang("Freak Scans", "https://freakscans.com", "en"),
- SingleLang("Glory Scans", "https://gloryscans.fr", "fr"),
- SingleLang("Gremory Mangas", "https://gremorymangas.com", "es"),
- SingleLang("Hanuman Scan", "https://hanumanscan.com", "en"),
- SingleLang("Hentai20", "https://hentai20.io", "en", isNsfw = true, overrideVersionCode = 9),
- SingleLang("Heroxia", "https://heroxia.com", "id", isNsfw = true),
- SingleLang("Hikari Scan", "https://hikariscan.org", "pt-BR", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Imagine Scan", "https://imaginescan.com.br", "pt-BR", isNsfw = true, overrideVersionCode = 1),
- SingleLang("InariManga", "https://inarimanga.net", "es", overrideVersionCode = 8),
- SingleLang("Infernal Void Scans", "https://void-scans.com", "en", overrideVersionCode = 5),
- SingleLang("Iris Scanlator", "https://irisscanlator.com.br", "pt-BR"),
- SingleLang("Kai Scans", "https://kaiscans.org", "en", overrideVersionCode = 1),
- SingleLang("Kanzenin", "https://kanzenin.info", "id", isNsfw = true, overrideVersionCode = 1),
- SingleLang("KataKomik", "https://katakomik.my.id", "id", overrideVersionCode = 1),
- SingleLang("King of Shojo", "https://kingofshojo.com", "ar", overrideVersionCode = 1),
- SingleLang("Kiryuu", "https://kiryuu.id", "id", overrideVersionCode = 6),
- SingleLang("Komik AV", "https://komikav.com", "id", overrideVersionCode = 1),
- SingleLang("Komik Cast", "https://komikcast.lol", "id", overrideVersionCode = 26),
- SingleLang("Komik Lab", "https://komiklab.com", "en", overrideVersionCode = 3),
- SingleLang("Komik Station", "https://komikstation.co", "id", overrideVersionCode = 4),
- SingleLang("KomikIndo.co", "https://komikindo.co", "id", className = "KomikindoCo", overrideVersionCode = 3),
- SingleLang("KomikMama", "https://komik-mama.com", "id", overrideVersionCode = 2),
- SingleLang("KomikManhwa", "https://komikmanhwa.me", "id", isNsfw = true),
- SingleLang("Komiksan", "https://komiksan.link", "id", overrideVersionCode = 2),
- SingleLang("Komiktap", "https://komiktap.me", "id", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Komiku.com", "https://komiku.com", "id", className = "KomikuCom"),
- SingleLang("Kuma Scans (Kuma Translation)", "https://kumascans.com", "en", className = "KumaScans", overrideVersionCode = 1),
- SingleLang("KumaPoi", "https://kumapoi.info", "id", isNsfw = true, overrideVersionCode = 3),
- SingleLang("Lami-Manga", "https://www.lami-manga.com", "th", isNsfw = true, className = "LamiManga"),
- SingleLang("Legacy Scans", "https://legacy-scans.com", "fr", pkgName = "flamescansfr"),
- SingleLang("Lelmanga", "https://www.lelmanga.com", "fr"),
- SingleLang("LianScans", "https://www.lianscans.my.id", "id", isNsfw = true),
- SingleLang("Luminous Scans", "https://lumitoon.com", "en", overrideVersionCode = 3),
- SingleLang("Lunar Scans", "https://lunarscan.org", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Magus Manga", "https://vofeg.com", "en", overrideVersionCode = 2),
- SingleLang("Makimaaaaa", "https://makimaaaaa.com", "th", isNsfw = true),
- SingleLang("Manga Efendisi", "https://mangaefendisi.net", "tr"),
- SingleLang("Manga Flame", "https://mangaflame.org", "ar", overrideVersionCode = 1),
- SingleLang("Manga Kings", "https://mangakings.com.tr", "tr"),
- SingleLang("Manga Pro", "https://mangapro.pro", "ar"),
- SingleLang("Manga Raw.org", "https://mangaraw.org", "ja", className = "MangaRawOrg", overrideVersionCode = 1),
- SingleLang("Mangacim", "https://www.mangacim.com", "tr", overrideVersionCode = 1),
- SingleLang("MangaKita", "https://mangakita.id", "id", overrideVersionCode = 2),
- SingleLang("Mangakyo", "https://mangakyo.vip", "id", overrideVersionCode = 4),
- SingleLang("MangaNoon", "https://manjanoon.net", "ar", sourceName = "مانجا نون", overrideVersionCode = 1),
- SingleLang("MangaShiina", "https://mangashiina.com", "es"),
- SingleLang("MangaShiro", "https://mangashiro.me", "id"),
- SingleLang("Mangasusu", "https://mangasusuku.xyz", "id", isNsfw = true, overrideVersionCode = 3),
- SingleLang("MangaSwat", "https://goldragon.me", "ar", overrideVersionCode = 15),
- SingleLang("MangaTale", "https://mangatale.co", "id", overrideVersionCode = 2),
- SingleLang("MangaWT", "https://mangawt.com", "tr", overrideVersionCode = 5),
- SingleLang("Mangayaro", "https://www.mangayaro.id", "id", overrideVersionCode = 1),
- SingleLang("MangaYu", "https://mangayu.id", "id"),
- SingleLang("Manga-Mate", "https://manga-mate.org", "ja", isNsfw = true, className = "MangaMate"),
- SingleLang("Manga-Moon", "https://manga-moons.net", "th", className = "MangaMoon"),
- SingleLang("Mangás Chan", "https://mangaschan.net", "pt-BR", className = "MangasChan", overrideVersionCode = 3),
- SingleLang("Mangás Online", "https://mangasonline.cc", "pt-BR", className = "MangasOnline"),
- SingleLang("Manhwa Freak", "https://manhwa-freak.com", "en", overrideVersionCode = 3),
- SingleLang("Manhwa Lover", "https://manhwalover.com", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("ManhwaDesu", "https://manhwadesu.one", "id", isNsfw = true, overrideVersionCode = 4),
- SingleLang("ManhwaFreak", "https://manhwafreak.fr", "fr", className = "ManhwaFreakFR"),
- SingleLang("ManhwaIndo", "https://manhwaindo.id", "id", isNsfw = true, overrideVersionCode = 4),
- SingleLang("ManhwaLand.mom", "https://manhwaland.lat", "id", isNsfw = true, className = "ManhwaLandMom", overrideVersionCode = 5),
- SingleLang("ManhwaList", "https://manhwalist.com", "id", overrideVersionCode = 4),
- SingleLang("Manhwax", "https://manhwax.org", "en", isNsfw = true, overrideVersionCode = 1),
- SingleLang("MELOKOMIK", "https://melokomik.xyz", "id"),
- SingleLang("Mihentai", "https://mihentai.com", "all", isNsfw = true, overrideVersionCode = 2),
- SingleLang("Mirai Scans", "https://miraiscans.com", "id"),
- SingleLang("MirrorDesu", "https://mirrordesu.me", "id", isNsfw = true),
- SingleLang("Nirvana Manga", "https://nirvanamanga.com", "tr", className = "NirvanaManga"),
- SingleLang("Natsu", "https://natsu.id", "id"),
- SingleLang("Nekomik", "https://nekomik.me", "id", overrideVersionCode = 2),
- SingleLang("NekoScans", "https://nekoscans.com", "es", isNsfw = true),
- SingleLang("Ngomik", "https://ngomik.net", "id", overrideVersionCode = 2),
- SingleLang("NIGHT SCANS", "https://nightscans.net", "en", isNsfw = true, className = "NightScans", overrideVersionCode = 3),
- SingleLang("Noromax", "https://noromax.my.id", "id"),
- SingleLang("NTR-Manga", "https://www.ntr-manga.com", "th", isNsfw = true, className = "NTRManga"),
- SingleLang("Origami Orpheans", "https://origami-orpheans.com", "pt-BR", overrideVersionCode = 10),
- SingleLang("Otsugami", "https://otsugami.id", "id"),
- SingleLang("Ozul Scans", "https://kingofmanga.com", "ar", overrideVersionCode = 2),
- SingleLang("Phantom Scans", "https://phantomscans.com", "en", overrideVersionCode = 1),
- SingleLang("PhenixScans", "https://phenixscans.fr", "fr", overrideVersionCode = 1),
- SingleLang("PotatoManga", "https://potatomanga.xyz", "ar", overrideVersionCode = 1),
- SingleLang("Quantum Scans", "https://readers-point.space", "en"),
- SingleLang("Raiki Scan", "https://raikiscan.com", "es"),
- SingleLang("Raven Scans", "https://ravenscans.com", "en", overrideVersionCode = 1),
- SingleLang("Rawkuma", "https://rawkuma.com", "ja", overrideVersionCode = 1),
- SingleLang("ReadGojo", "https://readgojo.com", "en"),
- SingleLang("Readkomik", "https://readkomik.com", "en", className = "ReadKomik", overrideVersionCode = 1),
- SingleLang("Sekaikomik", "https://sekaikomik.bio", "id", isNsfw = true, overrideVersionCode = 11),
- SingleLang("Sekte Doujin", "https://sektedoujin.cc", "id", isNsfw = true, overrideVersionCode = 5),
- SingleLang("Senpai Ediciones", "http://senpaiediciones.com", "es", overrideVersionCode = 1),
- SingleLang("Shadow Mangas", "https://shadowmangas.com", "es", overrideVersionCode = 1),
- SingleLang("Shea Manga", "https://sheakomik.com", "id", overrideVersionCode = 4),
- SingleLang("Shirakami", "https://shirakami.xyz", "id"),
- SingleLang("Silence Scan", "https://silencescan.com.br", "pt-BR", isNsfw = true, overrideVersionCode = 5),
- SingleLang("Siren Komik", "https://sirenkomik.my.id", "id", className = "MangKomik", overrideVersionCode = 2),
- SingleLang("SkyMangas", "https://skymangas.com", "es", overrideVersionCode = 1),
- SingleLang("Soul Scans", "https://soulscans.my.id", "id", overrideVersionCode = 1),
- SingleLang("SSSScanlator", "https://sssscanlator.com.br", "pt-BR", overrideVersionCode = 2),
- SingleLang("Starlight Scan", "https://starligthscan.com", "pt-BR", isNsfw = true),
- SingleLang("SummerToon", "https://summertoon.com", "tr"),
- SingleLang("Surya Scans", "https://suryatoon.com", "en", overrideVersionCode = 3),
- SingleLang("Sushi-Scan", "https://sushiscan.net", "fr", className = "SushiScan", overrideVersionCode = 10),
- SingleLang("Sushiscan.fr", "https://anime-sama.me", "fr", className = "SushiScanFR", overrideVersionCode = 1),
- SingleLang("Tarot Scans", "https://www.tarotscans.com", "tr"),
- SingleLang("Tecno Scan", "https://tecnoscann.com", "es", isNsfw = true, overrideVersionCode = 6),
- SingleLang("Tempest Fansub", "https://tempestfansub.com", "tr", isNsfw = true),
- SingleLang("Tenshi.id", "https://tenshi.id", "id", className = "TenshiId", pkgName = "masterkomik", overrideVersionCode = 4),
- SingleLang("The Apollo Team", "https://theapollo.team", "en"),
- SingleLang("Tres Daos Scan", "https://tresdaos.com", "es"),
- SingleLang("Tsundoku Traduções", "https://tsundoku.com.br", "pt-BR", className = "TsundokuTraducoes", overrideVersionCode = 9),
- SingleLang("TukangKomik", "https://tukangkomik.id", "id", overrideVersionCode = 1),
- SingleLang("TurkToon", "https://turktoon.com", "tr"),
- SingleLang("Uzay Manga", "https://uzaymanga.com", "tr", overrideVersionCode = 6),
- SingleLang("VF Scan", "https://www.vfscan.cc", "fr"),
- SingleLang("Walpurgi Scan", "https://www.walpurgiscan.it", "it", overrideVersionCode = 7, className = "WalpurgisScan"),
- SingleLang("West Manga", "https://westmanga.fun", "id", overrideVersionCode = 3),
- SingleLang("xCaliBR Scans", "https://xcalibrscans.com", "en", overrideVersionCode = 5),
- SingleLang("Zahard", "https://zahard.xyz", "en"),
- SingleLang("Area Manga", "https://www.areascans.net", "ar", sourceName = "أريا مانجا"),
- SingleLang("Vex Manga", "https://vexmanga.com", "ar", sourceName = "فيكس مانجا", overrideVersionCode = 3),
- SingleLang("Sodsaime", "https://www.xn--l3c0azab5a2gta.com", "th", isNsfw = true, sourceName = "สดใสเมะ", overrideVersionCode = 1),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MangaThemesiaGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangaworld/MangaWorldGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangaworld/MangaWorldGenerator.kt
deleted file mode 100644
index 772a85126..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangaworld/MangaWorldGenerator.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.mangaworld
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MangaWorldGenerator : ThemeSourceGenerator {
-
- override val themePkg = "mangaworld"
- override val themeClass = "MangaWorld"
- override val baseVersionCode: Int = 2
-
- override val sources = listOf(
- SingleLang("Mangaworld", "https://www.mangaworld.ac", "it", overrideVersionCode = 6),
- SingleLang("MangaworldAdult", "https://www.mangaworldadult.com", "it", isNsfw = true),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MangaWorldGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/masonry/MasonryGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/masonry/MasonryGenerator.kt
deleted file mode 100644
index 6ed89e406..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/masonry/MasonryGenerator.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.masonry
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MasonryGenerator : ThemeSourceGenerator {
-
- override val themePkg = "masonry"
-
- override val themeClass = "Masonry"
-
- override val baseVersionCode = 1
-
- override val sources = listOf(
- SingleLang("Elite Babes", "https://www.elitebabes.com", "all", isNsfw = true),
- SingleLang("Femjoy Hunter", "https://www.femjoyhunter.com", "all", isNsfw = true),
- SingleLang("FTV Hunter", "https://www.ftvhunter.com", "all", isNsfw = true),
- SingleLang("Joymii Hub", "https://www.joymiihub.com", "all", isNsfw = true),
- SingleLang("Metart Hunter", "https://www.metarthunter.com", "all", isNsfw = true),
- SingleLang("Playmate Hunter", "https://pmatehunter.com", "all", isNsfw = true),
- SingleLang("XArt Hunter", "https://www.xarthunter.com", "all", isNsfw = true),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MasonryGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMSGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMSGenerator.kt
deleted file mode 100644
index 2cb5f6c72..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mccms/MCCMSGenerator.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.mccms
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MCCMSGenerator : ThemeSourceGenerator {
- override val themeClass = "MCCMS"
- override val themePkg = "mccms"
- override val baseVersionCode = 6
- override val sources = listOf(
- SingleLang(
- name = "Kuaikuai Manhua 3",
- baseUrl = "https://mobile3.manhuaorg.com",
- lang = "zh",
- className = "Kuaikuai3",
- sourceName = "快快漫画3",
- overrideVersionCode = 0,
- ),
- SingleLang(
- name = "6Manhua",
- baseUrl = "https://www.liumanhua.com",
- lang = "zh",
- className = "SixMH",
- sourceName = "六漫画",
- overrideVersionCode = 4,
- ),
- SingleLang(
- name = "Miaoshang Manhua",
- baseUrl = "https://www.miaoshangmanhua.com",
- lang = "zh",
- className = "Miaoshang",
- sourceName = "喵上漫画",
- overrideVersionCode = 0,
- ),
- // The following sources are from https://www.yy123.cyou/
- SingleLang( // 103=他的那里, same as: www.hmanwang.com, www.lmmh.cc, www.999mh.net
- name = "Dida Manhua",
- baseUrl = "https://www.didamanhua.com/index.php",
- lang = "zh",
- isNsfw = true,
- className = "DidaManhua",
- sourceName = "嘀嗒漫画",
- overrideVersionCode = 1,
- ),
- SingleLang( // 103=青春男女(完结), same as: www.hanman.men
- name = "Damao Manhua",
- baseUrl = "https://www.hanman.cyou/index.php",
- lang = "zh",
- isNsfw = true,
- className = "DamaoManhua",
- sourceName = "大猫漫画",
- overrideVersionCode = 0,
- ),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MCCMSGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSGenerator.kt
deleted file mode 100644
index eec16c12b..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSGenerator.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.mmrcms
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MMRCMSGenerator : ThemeSourceGenerator {
-
- override val themePkg = "mmrcms"
-
- override val themeClass = "MMRCMS"
-
- override val baseVersionCode = 9
-
- override val sources = listOf(
- SingleLang("Bentoscan", "https://bentoscan.com", "fr"),
- SingleLang("Jpmangas", "https://jpmangas.xyz", "fr", overrideVersionCode = 2),
- SingleLang("Komikid", "https://www.komikid.com", "id"),
- SingleLang("Lelscan-VF", "https://lelscanvf.cc", "fr", className = "LelscanVF", overrideVersionCode = 2),
- SingleLang("Mangadoor", "https://mangadoor.com", "es", overrideVersionCode = 1, isNsfw = true),
- SingleLang("MangaID", "https://mangaid.click", "id", overrideVersionCode = 1),
- SingleLang("Mangas.in", "https://mangas.in", "es", isNsfw = true, className = "MangasIn", overrideVersionCode = 2),
- SingleLang("Manga-Scan", "https://mangascan-fr.com", "fr", className = "MangaScan", overrideVersionCode = 4),
- SingleLang("Onma", "https://onma.top", "ar", sourceName = "مانجا اون لاين"),
- SingleLang("Read Comics Online", "https://readcomicsonline.ru", "en"),
- SingleLang("Scan VF", "https://www.scan-vf.net", "fr", overrideVersionCode = 1),
- SingleLang("Utsukushii", "https://utsukushii-bg.com", "bg", overrideVersionCode = 1),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MMRCMSGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeGenerator.kt
deleted file mode 100644
index 943cd6552..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeGenerator.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.monochrome
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MonochromeGenerator : ThemeSourceGenerator {
- override val themePkg = "monochrome"
-
- override val themeClass = "MonochromeCMS"
-
- override val baseVersionCode = 4
-
- override val sources = listOf(
- SingleLang("Monochrome Scans", "https://manga.d34d.one", "en"),
- SingleLang("Monochrome Custom", "", "en"),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) = MonochromeGenerator().createAll()
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/ChanGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/ChanGenerator.kt
deleted file mode 100644
index 9e296df95..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/ChanGenerator.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.multichan
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class ChanGenerator : ThemeSourceGenerator {
-
- override val themePkg = "multichan"
-
- override val themeClass = "MultiChan"
-
- override val baseVersionCode = 3
-
- override val sources = listOf(
- SingleLang("MangaChan", "https://manga-chan.me", "ru", overrideVersionCode = 14),
- SingleLang("HenChan", "https://xxxxx.hentaichan.live", "ru", isNsfw = true, overrideVersionCode = 38),
- SingleLang("YaoiChan", "https://yaoi-chan.me", "ru", isNsfw = true, overrideVersionCode = 4),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- ChanGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMSGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMSGenerator.kt
deleted file mode 100644
index d13e8178f..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMSGenerator.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.mymangacms
-
-import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MyMangaCMSGenerator : ThemeSourceGenerator {
-
- override val themePkg = "mymangacms"
-
- override val themeClass = "MyMangaCMS"
-
- override val baseVersionCode: Int = 2
-
- override val sources = listOf(
- SingleLang(
- "TruyenTranhLH",
- "https://truyenlh.com",
- "vi",
- isNsfw = true,
- overrideVersionCode = 10,
- ),
- SingleLang(
- "Manhwa18",
- "https://manhwa18.com",
- "en",
- isNsfw = true,
- overrideVersionCode = 9,
- ),
- MultiLang(
- "Manhwa18.net",
- "https://manhwa18.net",
- listOf("en"),
- className = "Manhwa18Net",
- isNsfw = true,
- overrideVersionCode = 8,
- ),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- MyMangaCMSGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNepGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNepGenerator.kt
deleted file mode 100644
index 6bcadc5fc..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNepGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.nepnep
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class NepNepGenerator : ThemeSourceGenerator {
-
- override val themePkg = "nepnep"
-
- override val themeClass = "NepNep"
-
- override val baseVersionCode: Int = 12
-
- override val sources = listOf(
- SingleLang("MangaSee", "https://mangasee123.com", "en", overrideVersionCode = 24),
- SingleLang("MangaLife", "https://manga4life.com", "en", overrideVersionCode = 16),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- NepNepGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/otakusanctuary/OtakuSanctuaryGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/otakusanctuary/OtakuSanctuaryGenerator.kt
deleted file mode 100644
index ca3a70e49..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/otakusanctuary/OtakuSanctuaryGenerator.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.otakusanctuary
-
-import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceGenerator
-
-class OtakuSanctuaryGenerator : ThemeSourceGenerator {
-
- override val themePkg = "otakusanctuary"
-
- override val themeClass = "OtakuSanctuary"
-
- override val baseVersionCode: Int = 4
-
- override val sources = listOf(
- MultiLang(
- "Otaku Sanctuary",
- "https://otakusan.net",
- listOf("all", "vi", "en", "it", "fr", "es"),
- isNsfw = true,
- ),
- MultiLang(
- "MyRockManga",
- "https://myrockmanga.com",
- listOf("all", "vi", "en", "it", "fr", "es"),
- isNsfw = true,
- ),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- OtakuSanctuaryGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAltGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAltGenerator.kt
deleted file mode 100644
index 429104f2f..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAltGenerator.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.paprika
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class PaprikaAltGenerator : ThemeSourceGenerator {
-
- override val themePkg = "paprika"
-
- override val themeClass = "PaprikaAlt"
-
- override val baseVersionCode: Int = 1
-
- override val sources = listOf(
- SingleLang("MangaReader.cc", "http://mangareader.cc", "en", className = "MangaReaderCC", overrideVersionCode = 2), // more sites in the future might use MangaReader.cc 's overrides as they did in the past
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- PaprikaAltGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaGenerator.kt
deleted file mode 100644
index f02d06f99..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaGenerator.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.paprika
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class PaprikaGenerator : ThemeSourceGenerator {
-
- override val themePkg = "paprika"
-
- override val themeClass = "Paprika"
-
- override val baseVersionCode: Int = 1
-
- override val sources = listOf(
- SingleLang("MangaNelos.com", "http://manganelos.com", "en", className = "MangaNelosCom", overrideVersionCode = 1),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- PaprikaGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/peachscan/PeachScanGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/peachscan/PeachScanGenerator.kt
deleted file mode 100644
index a2a0bd699..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/peachscan/PeachScanGenerator.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.peachscan
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class PeachScanGenerator : ThemeSourceGenerator {
-
- override val themePkg = "peachscan"
-
- override val themeClass = "PeachScan"
-
- override val baseVersionCode = 2
-
- override val sources = listOf(
- SingleLang("Aurora Scan", "https://aurorascan.net", "pt-BR"),
- SingleLang("Dango Scan", "https://dangoscan.com.br", "pt-BR"),
- SingleLang("Mode Scanlator", "https://modescanlator.com", "pt-BR"),
- SingleLang("Nazarick Scan", "https://nazarickscan.com.br", "pt-BR"),
- SingleLang("RF Dragon Scan", "https://rfdragonscan.com", "pt-BR"),
- SingleLang("Wicked Witch Scan", "https://wicked-witch-scan.com", "pt-BR", pkgName = "wickedwitchscannovo", overrideVersionCode = 1),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- PeachScanGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReaderGenerator.kt
deleted file mode 100644
index 567f4c5db..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReaderGenerator.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.pizzareader
-
-// import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class PizzaReaderGenerator : ThemeSourceGenerator {
-
- override val themePkg = "pizzareader"
-
- override val themeClass = "PizzaReader"
-
- override val baseVersionCode: Int = 2
-
- override val sources = listOf(
- SingleLang("Phoenix Scans", "https://www.phoenixscans.com", "it", overrideVersionCode = 4),
- SingleLang("GTO The Great Site", "https://reader.gtothegreatsite.net", "it", className = "GTO", overrideVersionCode = 3),
- SingleLang("LupiTeam", "https://lupiteam.net", "it", overrideVersionCode = 3),
- SingleLang("TuttoAnimeManga", "https://tuttoanimemanga.net", "it", overrideVersionCode = 4),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- PizzaReaderGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/po2scans/PO2ScansGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/po2scans/PO2ScansGenerator.kt
deleted file mode 100644
index 769fc2ee8..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/po2scans/PO2ScansGenerator.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.po2scans
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class PO2ScansGenerator : ThemeSourceGenerator {
- override val themePkg = "po2scans"
-
- override val themeClass = "PO2Scans"
-
- override val baseVersionCode = 1
-
- override val sources = listOf(
- SingleLang("A Pair Of 2+", "https://po2scans.com", "en", className = "APairOf2", overrideVersionCode = 31),
- SingleLang("Sadscans", "https://sadscans.com", "tr"),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- PO2ScansGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readallcomics/ReadAllComicsGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readallcomics/ReadAllComicsGenerator.kt
deleted file mode 100644
index 1b22c0bc4..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readallcomics/ReadAllComicsGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.readallcomics
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class ReadAllComicsGenerator : ThemeSourceGenerator {
-
- override val themePkg = "readallcomics"
-
- override val themeClass = "ReadAllComics"
-
- override val baseVersionCode: Int = 1
-
- override val sources = listOf(
- SingleLang("ReadAllComics", "https://readallcomics.com", "en", className = "ReadAllComicsCom", overrideVersionCode = 1),
- SingleLang("ReadAllManga", "https://readallmanga.com", "en"),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- ReadAllComicsGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontGenerator.kt
deleted file mode 100644
index 53d804463..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/readerfront/ReaderFrontGenerator.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.readerfront
-
-import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class ReaderFrontGenerator : ThemeSourceGenerator {
- override val themePkg = "readerfront"
-
- override val themeClass = "ReaderFront"
-
- override val baseVersionCode = 8
-
- override val sources = listOf(
- MultiLang("Ravens Scans", "https://ravens-scans.com", listOf("es", "en"), true),
- SingleLang("Scylla Scans", "https://scyllascans.org", "en", overrideVersionCode = 1),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) = ReaderFrontGenerator().createAll()
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/senkuro/SenkuroGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/senkuro/SenkuroGenerator.kt
deleted file mode 100644
index 54c610701..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/senkuro/SenkuroGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.senkuro
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class SenkuroGenerator : ThemeSourceGenerator {
-
- override val themePkg = "senkuro"
-
- override val themeClass = "Senkuro"
-
- override val baseVersionCode = 2
-
- override val sources = listOf(
- SingleLang("Senkuro", "https://senkuro.com", "ru", overrideVersionCode = 0),
- SingleLang("Senkognito", "https://senkognito.com", "ru", isNsfw = true, overrideVersionCode = 0),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- SenkuroGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMHGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMHGenerator.kt
deleted file mode 100644
index 352aaa23d..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMHGenerator.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.sinmh
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class SinMHGenerator : ThemeSourceGenerator {
- override val themeClass = "SinMH"
- override val themePkg = "sinmh"
- override val baseVersionCode = 11
- override val sources = listOf(
- SingleLang(
- name = "Gufeng Manhua",
- baseUrl = "https://www.gufengmh.com",
- lang = "zh",
- className = "Gufengmh",
- sourceName = "古风漫画网",
- overrideVersionCode = 6,
- ),
- SingleLang( // This site blocks IP outside China
- name = "YKMH",
- baseUrl = "http://www.ykmh.com",
- lang = "zh",
- isNsfw = true,
- className = "YKMH",
- pkgName = "manhuadui",
- sourceName = "优酷漫画",
- overrideVersionCode = 17,
- ),
- SingleLang(
- name = "Qinqin Manhua",
- baseUrl = "http://www.acgwd.com",
- lang = "zh",
- className = "Qinqin",
- sourceName = "亲亲漫画",
- overrideVersionCode = 2,
- ),
- SingleLang(
- name = "92Manhua",
- baseUrl = "http://www.92mh.com",
- lang = "zh",
- isNsfw = true,
- className = "JiuerManhua",
- sourceName = "92漫画",
- overrideVersionCode = 0,
- ),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- SinMHGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsGenerator.kt
deleted file mode 100644
index dfd0b5664..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsGenerator.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.webtoons
-
-import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class WebtoonsGenerator : ThemeSourceGenerator {
-
- override val themePkg = "webtoons"
-
- override val themeClass = "Webtoons"
-
- override val baseVersionCode: Int = 2
-
- override val sources = listOf(
- MultiLang("Webtoons.com", "https://www.webtoons.com", listOf("en", "fr", "es", "id", "th", "zh-Hant", "de"), className = "WebtoonsFactory", pkgName = "webtoons", overrideVersionCode = 39),
- SingleLang("Dongman Manhua", "https://www.dongmanmanhua.cn", "zh"),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- WebtoonsGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslateGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslateGenerator.kt
deleted file mode 100644
index 0851a91bd..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslateGenerator.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.webtoons
-
-import generator.ThemeSourceData.MultiLang
-import generator.ThemeSourceGenerator
-
-class WebtoonsTranslateGenerator : ThemeSourceGenerator {
- override val themePkg = "webtoons"
-
- override val themeClass = "WebtoonsTranslation"
-
- override val baseVersionCode: Int = 2
-
- override val sources = listOf(
- MultiLang("Webtoons.com Translations", "https://translate.webtoons.com", listOf("en", "zh-Hans", "zh-Hant", "th", "id", "fr", "vi", "ru", "ar", "fil", "de", "hi", "it", "ja", "pt-BR", "tr", "ms", "pl", "pt", "bg", "da", "nl", "ro", "mn", "el", "lt", "cs", "sv", "bn", "fa", "uk", "es"), className = "WebtoonsTranslateFactory", pkgName = "webtoonstranslate", overrideVersionCode = 4),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- WebtoonsTranslateGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComicsGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComicsGenerator.kt
deleted file mode 100644
index 443f08e04..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComicsGenerator.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.wpcomics
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class WPComicsGenerator : ThemeSourceGenerator {
-
- override val themePkg = "wpcomics"
-
- override val themeClass = "WPComics"
-
- override val baseVersionCode: Int = 4
-
- override val sources = listOf(
- SingleLang("NetTruyen", "https://www.nettruyenss.com", "vi", overrideVersionCode = 22),
- SingleLang("NhatTruyen", "https://nhattruyento.com", "vi", overrideVersionCode = 14),
- SingleLang("XOXO Comics", "https://xoxocomic.com", "en", className = "XoxoComics", overrideVersionCode = 3),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- WPComicsGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/ZbuluGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/ZbuluGenerator.kt
deleted file mode 100644
index e1c87f447..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/ZbuluGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.zbulu
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class ZbuluGenerator : ThemeSourceGenerator {
-
- override val themePkg = "zbulu"
-
- override val themeClass = "Zbulu"
-
- override val baseVersionCode: Int = 6
-
- override val sources = listOf(
- SingleLang("HolyManga", "https://w30.holymanga.net", "en", isNsfw = true, overrideVersionCode = 2),
- SingleLang("My Toon", "https://mytoon.net", "en", isNsfw = true, overrideVersionCode = 1),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- ZbuluGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaGenerator.kt
deleted file mode 100644
index 47bb38d23..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaGenerator.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.zeistmanga
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class ZeistMangaGenerator : ThemeSourceGenerator {
-
- override val themePkg = "zeistmanga"
-
- override val themeClass = "ZeistManga"
-
- override val baseVersionCode: Int = 8
-
- override val sources = listOf(
- SingleLang("AiYuManhua", "https://www.aiyumanhua.com", "es", className = "AiYuManhua", pkgName = "aiyumanga", overrideVersionCode = 28),
- SingleLang("AnimeXNovel", "https://www.animexnovel.com", "pt-BR"),
- SingleLang("Celestial Moon", "https://www.celestialmoonscan.com", "es", isNsfw = true),
- SingleLang("Eleven Scanlator", "https://elevenscanlator.blogspot.com", "pt-BR"),
- SingleLang("Guilda Tier Draw", "https://www.guildatierdraw.com", "pt-BR", isNsfw = true),
- SingleLang("Hijala", "https://hijala.blogspot.com", "ar"),
- SingleLang("KLManhua", "https://klmanhua.blogspot.com", "id", isNsfw = true),
- SingleLang("KomikRealm", "https://www.komikrealm.my.id", "id"),
- SingleLang("Ler 999", "https://ler999.blogspot.com", "pt-BR"),
- SingleLang("Loner Translations", "https://loner-tl.blogspot.com", "ar"),
- SingleLang("Manga Ai Land", "https://manga-ai-land.blogspot.com", "ar"),
- SingleLang("Manga Soul", "https://www.manga-soul.com", "ar", isNsfw = true),
- SingleLang("MikoRoku", "https://www.mikoroku.web.id", "id", isNsfw = true, overrideVersionCode = 1),
- SingleLang("Mikrokosmos Fansub", "https://mikrokosmosfb.blogspot.com", "tr", isNsfw = true),
- SingleLang("Shadow Çeviri", "https://shadowceviri.blogspot.com", "tr", className = "ShadowCeviri"),
- SingleLang("ShiyuraSub", "https://shiyurasub.blogspot.com", "id"),
- SingleLang("Tooncubus", "https://www.tooncubus.top", "id", isNsfw = true),
- SingleLang("Tyrant Scans", "https://www.tyrantscans.com", "pt-BR"),
- SingleLang("Yokai", "https://yokai-team.blogspot.com", "ar", overrideVersionCode = 1),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- ZeistMangaGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zmanga/ZMangaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zmanga/ZMangaGenerator.kt
deleted file mode 100644
index 7391b306d..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zmanga/ZMangaGenerator.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.zmanga
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class ZMangaGenerator : ThemeSourceGenerator {
-
- override val themePkg = "zmanga"
-
- override val themeClass = "ZManga"
-
- override val baseVersionCode: Int = 1
-
- override val sources = listOf(
- SingleLang("KomikGan", "https://komikgan.com", "id"),
- SingleLang("Hensekai", "https://hensekai.com", "id", isNsfw = true),
- SingleLang("KomikIndo.info", "http://komikindo.info", "id", isNsfw = true, className = "KomikIndoInfo"),
- SingleLang("KomikPlay", "https://komikplay.com", "id", overrideVersionCode = 1),
- SingleLang("Maid - Manga", "https://www.maid.my.id", "id", overrideVersionCode = 10, className = "MaidManga"),
- SingleLang("ShiroDoujin", "https://shirodoujin.com", "id", isNsfw = true, overrideVersionCode = 1, className = "Shirodoujin"),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array) {
- ZMangaGenerator().createAll()
- }
- }
-}
diff --git a/multisrc/src/main/java/generator/GeneratorMain.kt b/multisrc/src/main/java/generator/GeneratorMain.kt
deleted file mode 100644
index fb29c8cfa..000000000
--- a/multisrc/src/main/java/generator/GeneratorMain.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package generator
-
-import java.io.File
-
-/**
- * Finds and calls all `ThemeSourceGenerator`s
- */
-fun main(args: Array) {
- val userDir = System.getProperty("user.dir")!!
- val sourcesDirPath = "$userDir/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc"
- val sourcesDir = File(sourcesDirPath)
-
- // find all theme packages
- sourcesDir.list()!!
- .filter { File(sourcesDir, it).isDirectory }
- .forEach { themeSource ->
- // Find all XxxGenerator.kt files and invoke main from them
- File("$sourcesDirPath/$themeSource").list()!!
- .filter { it.endsWith("Generator.kt") }
- .mapNotNull { generatorClass ->
- // Find Java class and extract method lists
- Class.forName("eu/kanade/tachiyomi/multisrc/$themeSource/$generatorClass".replace("/", ".").substringBefore(".kt"))
- .methods
- .find { it.name == "main" }
- }
- .forEach { it.invoke(null, emptyArray()) }
- }
-}
diff --git a/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt b/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt
deleted file mode 100644
index d3c7e6b46..000000000
--- a/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package generator
-
-import java.io.File
-
-/**
- * Finds all themes and creates an Intellij Idea run configuration for their generators
- * Should be run after creation/deletion of each theme
- */
-fun main(args: Array) {
- val userDir = System.getProperty("user.dir")!!
- val sourcesDirPath = "$userDir/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc"
- val sourcesDir = File(sourcesDirPath)
-
- // cleanup from past runs
- File("$userDir/.run").apply {
- if (exists()) {
- deleteRecursively()
- }
- mkdirs()
- }
-
- // find all theme packages
- sourcesDir.list()!!
- .filter { File(sourcesDir, it).isDirectory }
- .forEach { themeSource ->
- // Find all XxxGenerator.kt files
- File("$sourcesDirPath/$themeSource").list()!!
- .filter { it.endsWith("Generator.kt") }
- .map { it.substringBefore(".kt") }
- .forEach { generatorClass ->
- val file = File("$userDir/.run/$generatorClass.run.xml")
- val intellijConfStr = """
-
-
-
-
-
-
-
-
-
-
-
- """.trimIndent()
- file.writeText(intellijConfStr)
- file.appendText("\n")
- }
- }
-}
diff --git a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt
deleted file mode 100644
index e383e4acf..000000000
--- a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt
+++ /dev/null
@@ -1,278 +0,0 @@
-package generator
-
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import java.io.File
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
-import java.util.Locale
-
-/**
- * This is meant to be used in place of a factory extension, specifically for what would be a multi-source extension.
- * A multi-lang (but not multi-source) extension should still be made as a factory extension.
- * Use a generator for initial setup of a theme source or when all of the inheritors need a version bump.
- * Source list (val sources) should be kept up to date.
- */
-interface ThemeSourceGenerator {
- /**
- * The class that the sources inherit from.
- */
- val themeClass: String
-
- /**
- * The package that contains themeClass.
- */
- val themePkg: String
-
- /**
- * Base theme version, starts with 1 and should be increased when based theme class changes
- */
- val baseVersionCode: Int
-
- /**
- * The list of sources to be created or updated.
- */
- val sources: List
-
- fun createAll() {
- val userDir = System.getProperty("user.dir")!!
- sources.forEach { createGradleProject(it, themePkg, themeClass, baseVersionCode, userDir) }
- }
-
- companion object {
- private fun pkgNameSuffix(source: ThemeSourceData, separator: String): String {
- return if (source is ThemeSourceData.SingleLang) {
- listOf(source.lang.substringBefore("-"), source.pkgName).joinToString(separator)
- } else {
- listOf("all", source.pkgName).joinToString(separator)
- }
- }
-
- private fun themeSuffix(themePkg: String, separator: String): String {
- return listOf("eu", "kanade", "tachiyomi", "multisrc", themePkg).joinToString(separator)
- }
-
- private fun writeGradle(gradle: File, source: ThemeSourceData, themePkg: String, baseVersionCode: Int, defaultAdditionalGradlePath: String, additionalGradleOverridePath: String) {
- fun File.readTextOrEmptyString(): String = if (exists()) readText(Charsets.UTF_8) else ""
-
- val defaultAdditionalGradleText = File(defaultAdditionalGradlePath).readTextOrEmptyString()
- val additionalGradleOverrideText = File(additionalGradleOverridePath).readTextOrEmptyString()
- val placeholders = mapOf(
- "SOURCEHOST" to source.baseUrl.toHttpUrlOrNull()?.host,
- "SOURCESCHEME" to source.baseUrl.toHttpUrlOrNull()?.scheme,
- )
-
- val placeholdersStr = placeholders
- .filter { it.value != null }
- .map { "${" ".repeat(12)}${it.key}: \"${it.value}\"" }
- .joinToString(",\n")
-
- gradle.writeText(
- """
- |// THIS FILE IS AUTO-GENERATED; DO NOT EDIT
- |ext {
- | extName = '${source.name}'
- | extClass = '.${source.className}'
- | extVersionCode = ${baseVersionCode + source.overrideVersionCode + multisrcLibraryVersion}
- | ${if (source.isNsfw) "isNsfw = true\n" else ""}
- |}
- |
- |apply from: "${'$'}rootDir/common.gradle"
- |
- |$defaultAdditionalGradleText
- |$additionalGradleOverrideText
- |
- |android {
- | defaultConfig {
- | manifestPlaceholders += [
- |$placeholdersStr
- | ]
- | }
- |}
- |
- """.trimMargin(),
- )
- }
-
- private fun writeAndroidManifest(androidManifestFile: File, manifestOverridesPath: String, defaultAndroidManifestPath: String) {
- val androidManifestOverride = File(manifestOverridesPath)
- val defaultAndroidManifest = File(defaultAndroidManifestPath)
- if (androidManifestOverride.exists()) {
- androidManifestOverride.copyTo(androidManifestFile)
- } else if (defaultAndroidManifest.exists()) {
- defaultAndroidManifest.copyTo(androidManifestFile)
- }
- }
-
- fun createGradleProject(source: ThemeSourceData, themePkg: String, themeClass: String, baseVersionCode: Int, userDir: String) {
- // userDir = tachiyomi-extensions project root path
- val projectRootPath = "$userDir/generated-src/${pkgNameSuffix(source, "/")}"
- val projectSrcPath = "$projectRootPath/src/eu/kanade/tachiyomi/extension/${pkgNameSuffix(source, "/")}"
- val overridesPath = "$userDir/multisrc/overrides/$themePkg/${source.pkgName}"
- val defaultResPath = "$userDir/multisrc/overrides/$themePkg/default/res"
- val defaultAndroidManifestPath = "$userDir/multisrc/overrides/$themePkg/default/AndroidManifest.xml"
- val defaultAdditionalGradlePath = "$userDir/multisrc/overrides/$themePkg/default/additional.gradle"
- val resOverridePath = "$overridesPath/res"
- val srcOverridePath = "$overridesPath/src"
- val manifestOverridePath = "$overridesPath/AndroidManifest.xml"
- val additionalGradleOverridePath = "$overridesPath/additional.gradle"
- val projectGradleFile = File("$projectRootPath/build.gradle")
- val projectAndroidManifestFile = File("$projectRootPath/AndroidManifest.xml")
-
- File(projectRootPath).let { projectRootFile ->
- println("Generating $source")
-
- // remove everything from past runs
- projectRootFile.deleteRecursively()
- projectRootFile.mkdirs()
-
- writeGradle(projectGradleFile, source, themePkg, baseVersionCode, defaultAdditionalGradlePath, additionalGradleOverridePath)
- writeAndroidManifest(projectAndroidManifestFile, manifestOverridePath, defaultAndroidManifestPath)
-
- writeSourceClasses(projectSrcPath, srcOverridePath, source, themePkg, themeClass)
- copyThemeClasses(userDir, themePkg, projectRootPath)
- copyThemeReadmes(userDir, themePkg, overridesPath, projectRootPath)
- copyResFiles(resOverridePath, defaultResPath, source, projectRootPath)
- }
- }
-
- private fun copyThemeReadmes(userDir: String, themePkg: String, overridesPath: String, projectRootPath: String) {
- val sourcePath = "$userDir/multisrc/src/main/java/${themeSuffix(themePkg, "/")}"
-
- File(projectRootPath).mkdirs()
-
- listOf(sourcePath, overridesPath).forEach { path ->
- File(path).list()
- ?.filter { it.endsWith("README.md") || it.endsWith("CHANGELOG.md") }
- ?.forEach {
- Files.copy(
- File("$path/$it").toPath(),
- File("$projectRootPath/$it").toPath(),
- StandardCopyOption.REPLACE_EXISTING,
- )
- }
- }
- }
-
- private fun copyThemeClasses(userDir: String, themePkg: String, projectRootPath: String) {
- val themeSrcPath = "$userDir/multisrc/src/main/java/${themeSuffix(themePkg, "/")}"
-
- val themeDestPath = "$projectRootPath/src/${themeSuffix(themePkg, "/")}"
- File(themeDestPath).mkdirs()
-
- File(themeSrcPath).list()
- ?.filter { it.endsWith(".kt") && !it.endsWith("Generator.kt") && !it.endsWith("Gen.kt") }
- ?.forEach { Files.copy(File("$themeSrcPath/$it").toPath(), File("$themeDestPath/$it").toPath(), StandardCopyOption.REPLACE_EXISTING) }
- }
-
- private fun copyResFiles(resOverridePath: String, defaultResPath: String, source: ThemeSourceData, projectRootPath: String): Any {
- // check if res override exists if not copy default res
- val resOverride = File(resOverridePath)
- return if (resOverride.exists()) {
- resOverride.copyRecursively(File("$projectRootPath/res"))
- } else {
- File(defaultResPath).let { defaultResFile ->
- if (defaultResFile.exists()) defaultResFile.copyRecursively(File("$projectRootPath/res"))
- }
- }
- }
-
- private fun writeSourceClasses(projectSrcPath: String, srcOverridePath: String, source: ThemeSourceData, themePkg: String, themeClass: String) {
- val projectSrcFile = File(projectSrcPath)
- projectSrcFile.mkdirs()
-
- val srcOverrideFile = File(srcOverridePath)
- if (srcOverrideFile.exists()) {
- srcOverrideFile.copyRecursively(projectSrcFile)
- } else {
- writeSourceClass(projectSrcFile, source, themePkg, themeClass)
- }
- }
-
- private fun writeSourceClass(classPath: File, source: ThemeSourceData, themePkg: String, themeClass: String) {
- fun factoryClassText() = when (source) {
- is ThemeSourceData.SingleLang -> {
- """class ${source.className} : $themeClass("${source.sourceName}", "${source.baseUrl}", "${source.lang}")"""
- }
- is ThemeSourceData.MultiLang -> {
- val sourceClasses = source.langs.map { lang ->
- """$themeClass("${source.sourceName}", "${source.baseUrl}", "$lang")"""
- }
-
- """
- |class ${source.className} : SourceFactory {
- | override fun createSources() = listOf(
- | ${sourceClasses.joinToString(",\n")}
- | )
- |}
- """.trimMargin()
- }
- }
-
- File("$classPath/${source.className}.kt").writeText(
- """
- |/* ktlint-disable */
- |// THIS FILE IS AUTO-GENERATED; DO NOT EDIT
- |package eu.kanade.tachiyomi.extension.${pkgNameSuffix(source, ".")}
- |
- |import eu.kanade.tachiyomi.multisrc.$themePkg.$themeClass
- |${if (source is ThemeSourceData.MultiLang) "import eu.kanade.tachiyomi.source.SourceFactory" else ""}
- |
- |${factoryClassText()}
- """.trimMargin(),
- )
- }
- }
-}
-
-sealed class ThemeSourceData {
- abstract val name: String
- abstract val baseUrl: String
- abstract val isNsfw: Boolean
- abstract val className: String
- abstract val pkgName: String
-
- /**
- * Override it if for some reason the name attribute inside the source class
- * should be different from the extension name. Useful in cases where the
- * extension name should be romanized and the source name should be the one
- * in the source language. Defaults to the extension name if not specified.
- */
- abstract val sourceName: String
-
- /**
- * overrideVersionCode defaults to 0, if a source changes their source override code or
- * a previous existing source suddenly needs source code overrides, overrideVersionCode
- * should be increased.
- * When a new source is added with overrides, overrideVersionCode should still be set to 0
- *
- * Note: source code overrides are located in "multisrc/overrides/src//"
- */
- abstract val overrideVersionCode: Int
-
- data class SingleLang(
- override val name: String,
- override val baseUrl: String,
- val lang: String,
- override val isNsfw: Boolean = false,
- override val className: String = name.replace(" ", ""),
- override val pkgName: String = className.lowercase(Locale.ENGLISH),
- override val sourceName: String = name,
- override val overrideVersionCode: Int = 0,
- ) : ThemeSourceData()
-
- data class MultiLang(
- override val name: String,
- override val baseUrl: String,
- val langs: List,
- override val isNsfw: Boolean = false,
- override val className: String = name.replace(" ", "") + "Factory",
- override val pkgName: String = className.substringBefore("Factory").lowercase(Locale.ENGLISH),
- override val sourceName: String = name,
- override val overrideVersionCode: Int = 0,
- ) : ThemeSourceData()
-}
-
-/**
- * This variable should be increased when the multisrc library changes in a way that prompts global extension upgrade
- */
-const val multisrcLibraryVersion = 0
diff --git a/settings.gradle.kts b/settings.gradle.kts
index aff147b92..0ecf04430 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,12 +6,10 @@ File(rootDir, "lib").eachDir { include("lib:${it.name}") }
// Load all modules under /lib-multisrc
File(rootDir, "lib-multisrc").eachDir { include("lib-multisrc:${it.name}") }
-// Local development (full project build)
-include(":multisrc")
-project(":multisrc").projectDir = File("multisrc")
+
loadAllIndividualExtensions()
-loadAllGeneratedMultisrcExtensions()
+
fun loadAllIndividualExtensions() {
File(rootDir, "src").eachDir { dir ->
@@ -22,15 +20,22 @@ fun loadAllIndividualExtensions() {
}
}
}
+fun loadIndividualExtension(lang: String, name: String) {
+ val projectName = ":extensions:individual:$lang:$name"
+ include(projectName)
+ project(projectName).projectDir = File("src/${lang}/${name}")
+}
-fun loadAllGeneratedMultisrcExtensions() {
- File(rootDir, "generated-src").eachDir { dir ->
- dir.eachDir { subdir ->
- val name = ":extensions:multisrc:${dir.name}:${subdir.name}"
- include(name)
- project(name).projectDir = File("generated-src/${dir.name}/${subdir.name}")
- }
- }
+fun File.getChunk(chunk: Int, chunkSize: Int): List? {
+ return listFiles()
+ // Lang folder
+ ?.filter { it.isDirectory }
+ // Extension subfolders
+ ?.mapNotNull { dir -> dir.listFiles()?.filter { it.isDirectory } }
+ ?.flatten()
+ ?.sortedBy { it.name }
+ ?.chunked(chunkSize)
+ ?.get(chunk)
}
fun File.eachDir(block: (File) -> Unit) {
diff --git a/multisrc/overrides/bilibili/bilibilicomics/AndroidManifest.xml b/src/all/bilibilicomics/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/bilibili/bilibilicomics/AndroidManifest.xml
rename to src/all/bilibilicomics/AndroidManifest.xml
diff --git a/src/all/bilibilicomics/build.gradle b/src/all/bilibilicomics/build.gradle
new file mode 100644
index 000000000..362a0d24a
--- /dev/null
+++ b/src/all/bilibilicomics/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'BILIBILI COMICS'
+ extClass = '.BilibiliComicsFactory'
+ themePkg = 'bilibili'
+ baseUrl = 'https://www.bilibilicomics.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/bilibili/default/res/mipmap-hdpi/ic_launcher.png b/src/all/bilibilicomics/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bilibili/default/res/mipmap-hdpi/ic_launcher.png
rename to src/all/bilibilicomics/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/bilibili/default/res/mipmap-mdpi/ic_launcher.png b/src/all/bilibilicomics/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bilibili/default/res/mipmap-mdpi/ic_launcher.png
rename to src/all/bilibilicomics/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/bilibili/default/res/mipmap-xhdpi/ic_launcher.png b/src/all/bilibilicomics/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bilibili/default/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/bilibilicomics/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/bilibili/default/res/mipmap-xxhdpi/ic_launcher.png b/src/all/bilibilicomics/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bilibili/default/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/bilibilicomics/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/bilibili/default/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/bilibilicomics/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bilibili/default/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/bilibilicomics/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/bilibili/bilibilicomics/src/BilibiliComicsFactory.kt b/src/all/bilibilicomics/src/eu/kanade/tachiyomi/extension/all/bilibilicomics/BilibiliComicsFactory.kt
similarity index 100%
rename from multisrc/overrides/bilibili/bilibilicomics/src/BilibiliComicsFactory.kt
rename to src/all/bilibilicomics/src/eu/kanade/tachiyomi/extension/all/bilibilicomics/BilibiliComicsFactory.kt
diff --git a/src/all/comicznetv2/build.gradle b/src/all/comicznetv2/build.gradle
new file mode 100644
index 000000000..7e4916b72
--- /dev/null
+++ b/src/all/comicznetv2/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Comicz.net v2'
+ extClass = '.ComiczNetV2'
+ themePkg = 'madara'
+ baseUrl = 'https://v2.comiz.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/comicznetv2/res/mipmap-hdpi/ic_launcher.png b/src/all/comicznetv2/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicznetv2/res/mipmap-hdpi/ic_launcher.png
rename to src/all/comicznetv2/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicznetv2/res/mipmap-mdpi/ic_launcher.png b/src/all/comicznetv2/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicznetv2/res/mipmap-mdpi/ic_launcher.png
rename to src/all/comicznetv2/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicznetv2/res/mipmap-xhdpi/ic_launcher.png b/src/all/comicznetv2/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicznetv2/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/comicznetv2/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicznetv2/res/mipmap-xxhdpi/ic_launcher.png b/src/all/comicznetv2/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicznetv2/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/comicznetv2/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicznetv2/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/comicznetv2/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicznetv2/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/comicznetv2/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicznetv2/src/ComiczNetV2.kt b/src/all/comicznetv2/src/eu/kanade/tachiyomi/extension/all/comicznetv2/ComiczNetV2.kt
similarity index 100%
rename from multisrc/overrides/madara/comicznetv2/src/ComiczNetV2.kt
rename to src/all/comicznetv2/src/eu/kanade/tachiyomi/extension/all/comicznetv2/ComiczNetV2.kt
diff --git a/src/all/coomer/build.gradle b/src/all/coomer/build.gradle
new file mode 100644
index 000000000..6434d25f9
--- /dev/null
+++ b/src/all/coomer/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Coomer'
+ extClass = '.Coomer'
+ themePkg = 'kemono'
+ baseUrl = 'https://coomer.su'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/kemono/coomer/res/mipmap-hdpi/ic_launcher.png b/src/all/coomer/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/kemono/coomer/res/mipmap-hdpi/ic_launcher.png
rename to src/all/coomer/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/kemono/coomer/res/mipmap-mdpi/ic_launcher.png b/src/all/coomer/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/kemono/coomer/res/mipmap-mdpi/ic_launcher.png
rename to src/all/coomer/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/kemono/coomer/res/mipmap-xhdpi/ic_launcher.png b/src/all/coomer/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/kemono/coomer/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/coomer/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/kemono/coomer/res/mipmap-xxhdpi/ic_launcher.png b/src/all/coomer/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/kemono/coomer/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/coomer/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/kemono/coomer/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/coomer/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/kemono/coomer/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/coomer/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/all/coomer/src/eu/kanade/tachiyomi/extension/all/coomer/Coomer.kt b/src/all/coomer/src/eu/kanade/tachiyomi/extension/all/coomer/Coomer.kt
new file mode 100644
index 000000000..f9fe0cd56
--- /dev/null
+++ b/src/all/coomer/src/eu/kanade/tachiyomi/extension/all/coomer/Coomer.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.all.coomer
+
+import eu.kanade.tachiyomi.multisrc.kemono.Kemono
+
+class Coomer : Kemono("Coomer", "https://coomer.su", "all")
diff --git a/src/all/elitebabes/build.gradle b/src/all/elitebabes/build.gradle
new file mode 100644
index 000000000..322751007
--- /dev/null
+++ b/src/all/elitebabes/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Elite Babes'
+ extClass = '.EliteBabes'
+ themePkg = 'masonry'
+ baseUrl = 'https://www.elitebabes.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/masonry/elitebabes/res/mipmap-hdpi/ic_launcher.png b/src/all/elitebabes/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/elitebabes/res/mipmap-hdpi/ic_launcher.png
rename to src/all/elitebabes/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/elitebabes/res/mipmap-mdpi/ic_launcher.png b/src/all/elitebabes/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/elitebabes/res/mipmap-mdpi/ic_launcher.png
rename to src/all/elitebabes/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/elitebabes/res/mipmap-xhdpi/ic_launcher.png b/src/all/elitebabes/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/elitebabes/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/elitebabes/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/elitebabes/res/mipmap-xxhdpi/ic_launcher.png b/src/all/elitebabes/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/elitebabes/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/elitebabes/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/elitebabes/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/elitebabes/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/elitebabes/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/elitebabes/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/all/elitebabes/src/eu/kanade/tachiyomi/extension/all/elitebabes/EliteBabes.kt b/src/all/elitebabes/src/eu/kanade/tachiyomi/extension/all/elitebabes/EliteBabes.kt
new file mode 100644
index 000000000..2d0e3de85
--- /dev/null
+++ b/src/all/elitebabes/src/eu/kanade/tachiyomi/extension/all/elitebabes/EliteBabes.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.all.elitebabes
+
+import eu.kanade.tachiyomi.multisrc.masonry.Masonry
+
+class EliteBabes : Masonry("Elite Babes", "https://www.elitebabes.com", "all")
diff --git a/src/all/femjoyhunter/build.gradle b/src/all/femjoyhunter/build.gradle
new file mode 100644
index 000000000..9cc1904ec
--- /dev/null
+++ b/src/all/femjoyhunter/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Femjoy Hunter'
+ extClass = '.FemjoyHunter'
+ themePkg = 'masonry'
+ baseUrl = 'https://www.femjoyhunter.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/masonry/femjoyhunter/res/mipmap-hdpi/ic_launcher.png b/src/all/femjoyhunter/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/femjoyhunter/res/mipmap-hdpi/ic_launcher.png
rename to src/all/femjoyhunter/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/femjoyhunter/res/mipmap-mdpi/ic_launcher.png b/src/all/femjoyhunter/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/femjoyhunter/res/mipmap-mdpi/ic_launcher.png
rename to src/all/femjoyhunter/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/femjoyhunter/res/mipmap-xhdpi/ic_launcher.png b/src/all/femjoyhunter/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/femjoyhunter/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/femjoyhunter/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/femjoyhunter/res/mipmap-xxhdpi/ic_launcher.png b/src/all/femjoyhunter/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/femjoyhunter/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/femjoyhunter/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/femjoyhunter/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/femjoyhunter/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/femjoyhunter/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/femjoyhunter/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/all/femjoyhunter/src/eu/kanade/tachiyomi/extension/all/femjoyhunter/FemjoyHunter.kt b/src/all/femjoyhunter/src/eu/kanade/tachiyomi/extension/all/femjoyhunter/FemjoyHunter.kt
new file mode 100644
index 000000000..0d565e87e
--- /dev/null
+++ b/src/all/femjoyhunter/src/eu/kanade/tachiyomi/extension/all/femjoyhunter/FemjoyHunter.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.all.femjoyhunter
+
+import eu.kanade.tachiyomi.multisrc.masonry.Masonry
+
+class FemjoyHunter : Masonry("Femjoy Hunter", "https://www.femjoyhunter.com", "all")
diff --git a/src/all/foolslidecustomizable/build.gradle b/src/all/foolslidecustomizable/build.gradle
new file mode 100644
index 000000000..fe51df4bc
--- /dev/null
+++ b/src/all/foolslidecustomizable/build.gradle
@@ -0,0 +1,8 @@
+ext {
+ extName = 'FoolSlide Customizable'
+ extClass = '.FoolSlideCustomizableFactory'
+ themePkg = 'foolslide'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/foolslide/foolslidecustomizable/src/FoolSlideCustomizableFactory.kt b/src/all/foolslidecustomizable/src/eu/kanade/tachiyomi/extension/all/foolslidecustomizable/FoolSlideCustomizableFactory.kt
similarity index 100%
rename from multisrc/overrides/foolslide/foolslidecustomizable/src/FoolSlideCustomizableFactory.kt
rename to src/all/foolslidecustomizable/src/eu/kanade/tachiyomi/extension/all/foolslidecustomizable/FoolSlideCustomizableFactory.kt
diff --git a/src/all/ftvhunter/build.gradle b/src/all/ftvhunter/build.gradle
new file mode 100644
index 000000000..0abfe65c8
--- /dev/null
+++ b/src/all/ftvhunter/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'FTV Hunter'
+ extClass = '.FTVHunter'
+ themePkg = 'masonry'
+ baseUrl = 'https://www.ftvhunter.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/masonry/ftvhunter/res/mipmap-hdpi/ic_launcher.png b/src/all/ftvhunter/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/ftvhunter/res/mipmap-hdpi/ic_launcher.png
rename to src/all/ftvhunter/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/ftvhunter/res/mipmap-mdpi/ic_launcher.png b/src/all/ftvhunter/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/ftvhunter/res/mipmap-mdpi/ic_launcher.png
rename to src/all/ftvhunter/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/ftvhunter/res/mipmap-xhdpi/ic_launcher.png b/src/all/ftvhunter/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/ftvhunter/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/ftvhunter/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/ftvhunter/res/mipmap-xxhdpi/ic_launcher.png b/src/all/ftvhunter/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/ftvhunter/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/ftvhunter/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/ftvhunter/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/ftvhunter/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/ftvhunter/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/ftvhunter/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/all/ftvhunter/src/eu/kanade/tachiyomi/extension/all/ftvhunter/FTVHunter.kt b/src/all/ftvhunter/src/eu/kanade/tachiyomi/extension/all/ftvhunter/FTVHunter.kt
new file mode 100644
index 000000000..2f2dca1dc
--- /dev/null
+++ b/src/all/ftvhunter/src/eu/kanade/tachiyomi/extension/all/ftvhunter/FTVHunter.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.all.ftvhunter
+
+import eu.kanade.tachiyomi.multisrc.masonry.Masonry
+
+class FTVHunter : Masonry("FTV Hunter", "https://www.ftvhunter.com", "all")
diff --git a/src/all/grabberzone/build.gradle b/src/all/grabberzone/build.gradle
new file mode 100644
index 000000000..02b699000
--- /dev/null
+++ b/src/all/grabberzone/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Grabber Zone'
+ extClass = '.GrabberZone'
+ themePkg = 'madara'
+ baseUrl = 'https://grabber.zone'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/grabberzone/res/mipmap-hdpi/ic_launcher.png b/src/all/grabberzone/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/grabberzone/res/mipmap-hdpi/ic_launcher.png
rename to src/all/grabberzone/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/grabberzone/res/mipmap-mdpi/ic_launcher.png b/src/all/grabberzone/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/grabberzone/res/mipmap-mdpi/ic_launcher.png
rename to src/all/grabberzone/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/grabberzone/res/mipmap-xhdpi/ic_launcher.png b/src/all/grabberzone/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/grabberzone/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/grabberzone/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/grabberzone/res/mipmap-xxhdpi/ic_launcher.png b/src/all/grabberzone/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/grabberzone/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/grabberzone/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/grabberzone/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/grabberzone/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/grabberzone/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/grabberzone/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/grabberzone/src/GrabberZone.kt b/src/all/grabberzone/src/eu/kanade/tachiyomi/extension/all/grabberzone/GrabberZone.kt
similarity index 100%
rename from multisrc/overrides/madara/grabberzone/src/GrabberZone.kt
rename to src/all/grabberzone/src/eu/kanade/tachiyomi/extension/all/grabberzone/GrabberZone.kt
diff --git a/src/all/hentaihand/build.gradle b/src/all/hentaihand/build.gradle
new file mode 100644
index 000000000..2512b8637
--- /dev/null
+++ b/src/all/hentaihand/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HentaiHand'
+ extClass = '.HentaiHandFactory'
+ themePkg = 'hentaihand'
+ baseUrl = 'https://hentaihand.com'
+ overrideVersionCode = 5
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/hentaihand/hentaihand/res/mipmap-hdpi/ic_launcher.png b/src/all/hentaihand/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/hentaihand/res/mipmap-hdpi/ic_launcher.png
rename to src/all/hentaihand/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/hentaihand/res/mipmap-mdpi/ic_launcher.png b/src/all/hentaihand/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/hentaihand/res/mipmap-mdpi/ic_launcher.png
rename to src/all/hentaihand/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/hentaihand/res/mipmap-xhdpi/ic_launcher.png b/src/all/hentaihand/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/hentaihand/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/hentaihand/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/hentaihand/res/mipmap-xxhdpi/ic_launcher.png b/src/all/hentaihand/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/hentaihand/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/hentaihand/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/hentaihand/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/hentaihand/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/hentaihand/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/hentaihand/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/hentaihand/src/HentaiHandFactory.kt b/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHandFactory.kt
similarity index 100%
rename from multisrc/overrides/hentaihand/hentaihand/src/HentaiHandFactory.kt
rename to src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHandFactory.kt
diff --git a/src/all/hniscantrad/build.gradle b/src/all/hniscantrad/build.gradle
new file mode 100644
index 000000000..cdb039c8e
--- /dev/null
+++ b/src/all/hniscantrad/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'HNI-Scantrad'
+ extClass = '.HNIScantradFactory'
+ themePkg = 'foolslide'
+ baseUrl = 'https://hni-scantrad.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/foolslide/hniscantrad/res/mipmap-hdpi/ic_launcher.png b/src/all/hniscantrad/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/hniscantrad/res/mipmap-hdpi/ic_launcher.png
rename to src/all/hniscantrad/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/hniscantrad/res/mipmap-mdpi/ic_launcher.png b/src/all/hniscantrad/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/hniscantrad/res/mipmap-mdpi/ic_launcher.png
rename to src/all/hniscantrad/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/hniscantrad/res/mipmap-xhdpi/ic_launcher.png b/src/all/hniscantrad/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/hniscantrad/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/hniscantrad/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/hniscantrad/res/mipmap-xxhdpi/ic_launcher.png b/src/all/hniscantrad/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/hniscantrad/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/hniscantrad/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/hniscantrad/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/hniscantrad/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/hniscantrad/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/hniscantrad/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/hniscantrad/src/HNIScantradFactory.kt b/src/all/hniscantrad/src/eu/kanade/tachiyomi/extension/all/hniscantrad/HNIScantradFactory.kt
similarity index 100%
rename from multisrc/overrides/foolslide/hniscantrad/src/HNIScantradFactory.kt
rename to src/all/hniscantrad/src/eu/kanade/tachiyomi/extension/all/hniscantrad/HNIScantradFactory.kt
diff --git a/src/all/joymiihub/build.gradle b/src/all/joymiihub/build.gradle
new file mode 100644
index 000000000..c4f9fcbad
--- /dev/null
+++ b/src/all/joymiihub/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Joymii Hub'
+ extClass = '.JoymiiHub'
+ themePkg = 'masonry'
+ baseUrl = 'https://www.joymiihub.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/masonry/joymiihub/res/mipmap-hdpi/ic_launcher.png b/src/all/joymiihub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/joymiihub/res/mipmap-hdpi/ic_launcher.png
rename to src/all/joymiihub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/joymiihub/res/mipmap-mdpi/ic_launcher.png b/src/all/joymiihub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/joymiihub/res/mipmap-mdpi/ic_launcher.png
rename to src/all/joymiihub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/joymiihub/res/mipmap-xhdpi/ic_launcher.png b/src/all/joymiihub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/joymiihub/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/joymiihub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/joymiihub/res/mipmap-xxhdpi/ic_launcher.png b/src/all/joymiihub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/joymiihub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/joymiihub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/joymiihub/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/joymiihub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/joymiihub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/joymiihub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/all/joymiihub/src/eu/kanade/tachiyomi/extension/all/joymiihub/JoymiiHub.kt b/src/all/joymiihub/src/eu/kanade/tachiyomi/extension/all/joymiihub/JoymiiHub.kt
new file mode 100644
index 000000000..62cd1fa79
--- /dev/null
+++ b/src/all/joymiihub/src/eu/kanade/tachiyomi/extension/all/joymiihub/JoymiiHub.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.all.joymiihub
+
+import eu.kanade.tachiyomi.multisrc.masonry.Masonry
+
+class JoymiiHub : Masonry("Joymii Hub", "https://www.joymiihub.com", "all")
diff --git a/src/all/kemono/build.gradle b/src/all/kemono/build.gradle
new file mode 100644
index 000000000..3075d1eb9
--- /dev/null
+++ b/src/all/kemono/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Kemono'
+ extClass = '.Kemono'
+ themePkg = 'kemono'
+ baseUrl = 'https://kemono.su'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/all/kemono/src/eu/kanade/tachiyomi/extension/all/kemono/Kemono.kt b/src/all/kemono/src/eu/kanade/tachiyomi/extension/all/kemono/Kemono.kt
new file mode 100644
index 000000000..32b7ddfb0
--- /dev/null
+++ b/src/all/kemono/src/eu/kanade/tachiyomi/extension/all/kemono/Kemono.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.all.kemono
+
+import eu.kanade.tachiyomi.multisrc.kemono.Kemono
+
+class Kemono : Kemono("Kemono", "https://kemono.su", "all")
diff --git a/src/all/magicaltranslators/build.gradle b/src/all/magicaltranslators/build.gradle
new file mode 100644
index 000000000..d6a67eb2e
--- /dev/null
+++ b/src/all/magicaltranslators/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Magical Translators'
+ extClass = '.MagicalTranslatorsFactory'
+ themePkg = 'guya'
+ baseUrl = 'https://mahoushoujobu.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/guya/magicaltranslators/res/mipmap-hdpi/ic_launcher.png b/src/all/magicaltranslators/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/magicaltranslators/res/mipmap-hdpi/ic_launcher.png
rename to src/all/magicaltranslators/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/magicaltranslators/res/mipmap-mdpi/ic_launcher.png b/src/all/magicaltranslators/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/magicaltranslators/res/mipmap-mdpi/ic_launcher.png
rename to src/all/magicaltranslators/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/magicaltranslators/res/mipmap-xhdpi/ic_launcher.png b/src/all/magicaltranslators/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/magicaltranslators/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/magicaltranslators/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/magicaltranslators/res/mipmap-xxhdpi/ic_launcher.png b/src/all/magicaltranslators/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/magicaltranslators/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/magicaltranslators/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/magicaltranslators/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/magicaltranslators/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/magicaltranslators/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/magicaltranslators/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/magicaltranslators/src/MagicalTranslators.kt b/src/all/magicaltranslators/src/eu/kanade/tachiyomi/extension/all/magicaltranslators/MagicalTranslators.kt
similarity index 100%
rename from multisrc/overrides/guya/magicaltranslators/src/MagicalTranslators.kt
rename to src/all/magicaltranslators/src/eu/kanade/tachiyomi/extension/all/magicaltranslators/MagicalTranslators.kt
diff --git a/src/all/mangacrazy/build.gradle b/src/all/mangacrazy/build.gradle
new file mode 100644
index 000000000..5cb4c1747
--- /dev/null
+++ b/src/all/mangacrazy/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaCrazy'
+ extClass = '.MangaCrazy'
+ themePkg = 'madara'
+ baseUrl = 'https://mangacrazy.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangacrazy/res/mipmap-hdpi/ic_launcher.png b/src/all/mangacrazy/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacrazy/res/mipmap-hdpi/ic_launcher.png
rename to src/all/mangacrazy/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacrazy/res/mipmap-mdpi/ic_launcher.png b/src/all/mangacrazy/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacrazy/res/mipmap-mdpi/ic_launcher.png
rename to src/all/mangacrazy/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacrazy/res/mipmap-xhdpi/ic_launcher.png b/src/all/mangacrazy/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacrazy/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/mangacrazy/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacrazy/res/mipmap-xxhdpi/ic_launcher.png b/src/all/mangacrazy/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacrazy/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/mangacrazy/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacrazy/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/mangacrazy/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacrazy/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/mangacrazy/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacrazy/src/MangaCrazy.kt b/src/all/mangacrazy/src/eu/kanade/tachiyomi/extension/all/mangacrazy/MangaCrazy.kt
similarity index 100%
rename from multisrc/overrides/madara/mangacrazy/src/MangaCrazy.kt
rename to src/all/mangacrazy/src/eu/kanade/tachiyomi/extension/all/mangacrazy/MangaCrazy.kt
diff --git a/src/all/mangafire/build.gradle b/src/all/mangafire/build.gradle
new file mode 100644
index 000000000..509684dde
--- /dev/null
+++ b/src/all/mangafire/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaFire'
+ extClass = '.MangaFireFactory'
+ themePkg = 'mangareader'
+ baseUrl = 'https://mangafire.to'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangareader/mangafire/res/mipmap-hdpi/ic_launcher.png b/src/all/mangafire/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/mangafire/res/mipmap-hdpi/ic_launcher.png
rename to src/all/mangafire/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/mangafire/res/mipmap-mdpi/ic_launcher.png b/src/all/mangafire/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/mangafire/res/mipmap-mdpi/ic_launcher.png
rename to src/all/mangafire/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/mangafire/res/mipmap-xhdpi/ic_launcher.png b/src/all/mangafire/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/mangafire/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/mangafire/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/mangafire/res/mipmap-xxhdpi/ic_launcher.png b/src/all/mangafire/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/mangafire/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/mangafire/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/mangafire/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/mangafire/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/mangafire/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/mangafire/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/mangafire/src/Filters.kt b/src/all/mangafire/src/eu/kanade/tachiyomi/extension/all/mangafire/Filters.kt
similarity index 100%
rename from multisrc/overrides/mangareader/mangafire/src/Filters.kt
rename to src/all/mangafire/src/eu/kanade/tachiyomi/extension/all/mangafire/Filters.kt
diff --git a/multisrc/overrides/mangareader/mangafire/src/ImageInterceptor.kt b/src/all/mangafire/src/eu/kanade/tachiyomi/extension/all/mangafire/ImageInterceptor.kt
similarity index 100%
rename from multisrc/overrides/mangareader/mangafire/src/ImageInterceptor.kt
rename to src/all/mangafire/src/eu/kanade/tachiyomi/extension/all/mangafire/ImageInterceptor.kt
diff --git a/multisrc/overrides/mangareader/mangafire/src/MangaFire.kt b/src/all/mangafire/src/eu/kanade/tachiyomi/extension/all/mangafire/MangaFire.kt
similarity index 100%
rename from multisrc/overrides/mangareader/mangafire/src/MangaFire.kt
rename to src/all/mangafire/src/eu/kanade/tachiyomi/extension/all/mangafire/MangaFire.kt
diff --git a/multisrc/overrides/mangareader/mangafire/src/MangaFireFactory.kt b/src/all/mangafire/src/eu/kanade/tachiyomi/extension/all/mangafire/MangaFireFactory.kt
similarity index 100%
rename from multisrc/overrides/mangareader/mangafire/src/MangaFireFactory.kt
rename to src/all/mangafire/src/eu/kanade/tachiyomi/extension/all/mangafire/MangaFireFactory.kt
diff --git a/src/all/mangaforfree/build.gradle b/src/all/mangaforfree/build.gradle
new file mode 100644
index 000000000..af8df3c57
--- /dev/null
+++ b/src/all/mangaforfree/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaForFree.net'
+ extClass = '.MangaForFreeFactory'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaforfree.net'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaforfree/res/mipmap-hdpi/ic_launcher.png b/src/all/mangaforfree/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaforfree/res/mipmap-hdpi/ic_launcher.png
rename to src/all/mangaforfree/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaforfree/res/mipmap-mdpi/ic_launcher.png b/src/all/mangaforfree/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaforfree/res/mipmap-mdpi/ic_launcher.png
rename to src/all/mangaforfree/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaforfree/res/mipmap-xhdpi/ic_launcher.png b/src/all/mangaforfree/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaforfree/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/mangaforfree/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaforfree/res/mipmap-xxhdpi/ic_launcher.png b/src/all/mangaforfree/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaforfree/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/mangaforfree/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaforfree/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/mangaforfree/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaforfree/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/mangaforfree/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt b/src/all/mangaforfree/src/eu/kanade/tachiyomi/extension/all/mangaforfree/MangaForFreeFactory.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt
rename to src/all/mangaforfree/src/eu/kanade/tachiyomi/extension/all/mangaforfree/MangaForFreeFactory.kt
diff --git a/multisrc/overrides/mangareader/mangareaderto/CHANGELOG.md b/src/all/mangareaderto/CHANGELOG.md
similarity index 100%
rename from multisrc/overrides/mangareader/mangareaderto/CHANGELOG.md
rename to src/all/mangareaderto/CHANGELOG.md
diff --git a/src/all/mangareaderto/build.gradle b/src/all/mangareaderto/build.gradle
new file mode 100644
index 000000000..fe63d1062
--- /dev/null
+++ b/src/all/mangareaderto/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaReader'
+ extClass = '.MangaReaderFactory'
+ themePkg = 'mangareader'
+ baseUrl = 'https://mangareader.to'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangareader/mangareaderto/res/mipmap-hdpi/ic_launcher.png b/src/all/mangareaderto/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/mangareaderto/res/mipmap-hdpi/ic_launcher.png
rename to src/all/mangareaderto/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/mangareaderto/res/mipmap-mdpi/ic_launcher.png b/src/all/mangareaderto/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/mangareaderto/res/mipmap-mdpi/ic_launcher.png
rename to src/all/mangareaderto/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/mangareaderto/res/mipmap-xhdpi/ic_launcher.png b/src/all/mangareaderto/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/mangareaderto/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/mangareaderto/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/mangareaderto/res/mipmap-xxhdpi/ic_launcher.png b/src/all/mangareaderto/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/mangareaderto/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/mangareaderto/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/mangareaderto/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/mangareaderto/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/mangareaderto/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/mangareaderto/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/mangareaderto/src/Filters.kt b/src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/Filters.kt
similarity index 100%
rename from multisrc/overrides/mangareader/mangareaderto/src/Filters.kt
rename to src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/Filters.kt
diff --git a/multisrc/overrides/mangareader/mangareaderto/src/ImageInterceptor.kt b/src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/ImageInterceptor.kt
similarity index 100%
rename from multisrc/overrides/mangareader/mangareaderto/src/ImageInterceptor.kt
rename to src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/ImageInterceptor.kt
diff --git a/multisrc/overrides/mangareader/mangareaderto/src/MangaReader.kt b/src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/MangaReader.kt
similarity index 100%
rename from multisrc/overrides/mangareader/mangareaderto/src/MangaReader.kt
rename to src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/MangaReader.kt
diff --git a/multisrc/overrides/mangareader/mangareaderto/src/MangaReaderFactory.kt b/src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/MangaReaderFactory.kt
similarity index 100%
rename from multisrc/overrides/mangareader/mangareaderto/src/MangaReaderFactory.kt
rename to src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/MangaReaderFactory.kt
diff --git a/multisrc/overrides/mangareader/mangareaderto/src/Preferences.kt b/src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/Preferences.kt
similarity index 100%
rename from multisrc/overrides/mangareader/mangareaderto/src/Preferences.kt
rename to src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/Preferences.kt
diff --git a/src/all/mangatopsite/build.gradle b/src/all/mangatopsite/build.gradle
new file mode 100644
index 000000000..69db70b72
--- /dev/null
+++ b/src/all/mangatopsite/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaTop.site'
+ extClass = '.MangaTopSite'
+ themePkg = 'madara'
+ baseUrl = 'https://mangatop.site'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangatopsite/src/MangaTopSite.kt b/src/all/mangatopsite/src/eu/kanade/tachiyomi/extension/all/mangatopsite/MangaTopSite.kt
similarity index 100%
rename from multisrc/overrides/madara/mangatopsite/src/MangaTopSite.kt
rename to src/all/mangatopsite/src/eu/kanade/tachiyomi/extension/all/mangatopsite/MangaTopSite.kt
diff --git a/src/all/manhwa18cc/build.gradle b/src/all/manhwa18cc/build.gradle
new file mode 100644
index 000000000..0bfd49257
--- /dev/null
+++ b/src/all/manhwa18cc/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwa18.cc'
+ extClass = '.Manhwa18CcFactory'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwa18.cc'
+ overrideVersionCode = 4
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwa18cc/res/mipmap-hdpi/ic_launcher.png b/src/all/manhwa18cc/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18cc/res/mipmap-hdpi/ic_launcher.png
rename to src/all/manhwa18cc/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18cc/res/mipmap-mdpi/ic_launcher.png b/src/all/manhwa18cc/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18cc/res/mipmap-mdpi/ic_launcher.png
rename to src/all/manhwa18cc/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18cc/res/mipmap-xhdpi/ic_launcher.png b/src/all/manhwa18cc/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18cc/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/manhwa18cc/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18cc/res/mipmap-xxhdpi/ic_launcher.png b/src/all/manhwa18cc/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18cc/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/manhwa18cc/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18cc/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/manhwa18cc/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18cc/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/manhwa18cc/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18cc/src/Manhwa18CcFactory.kt b/src/all/manhwa18cc/src/eu/kanade/tachiyomi/extension/all/manhwa18cc/Manhwa18CcFactory.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwa18cc/src/Manhwa18CcFactory.kt
rename to src/all/manhwa18cc/src/eu/kanade/tachiyomi/extension/all/manhwa18cc/Manhwa18CcFactory.kt
diff --git a/src/all/manhwa18net/build.gradle b/src/all/manhwa18net/build.gradle
new file mode 100644
index 000000000..a72d32cad
--- /dev/null
+++ b/src/all/manhwa18net/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwa18.net'
+ extClass = '.Manhwa18Net'
+ themePkg = 'mymangacms'
+ baseUrl = 'https://manhwa18.net'
+ overrideVersionCode = 8
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mymangacms/manhwa18/res/mipmap-hdpi/ic_launcher.png b/src/all/manhwa18net/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/manhwa18/res/mipmap-hdpi/ic_launcher.png
rename to src/all/manhwa18net/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/manhwa18/res/mipmap-mdpi/ic_launcher.png b/src/all/manhwa18net/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/manhwa18/res/mipmap-mdpi/ic_launcher.png
rename to src/all/manhwa18net/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/manhwa18/res/mipmap-xhdpi/ic_launcher.png b/src/all/manhwa18net/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/manhwa18/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/manhwa18net/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/manhwa18/res/mipmap-xxhdpi/ic_launcher.png b/src/all/manhwa18net/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/manhwa18/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/manhwa18net/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/manhwa18/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/manhwa18net/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/manhwa18/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/manhwa18net/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/manhwa18net/src/Manhwa18Net.kt b/src/all/manhwa18net/src/eu/kanade/tachiyomi/extension/all/manhwa18net/Manhwa18Net.kt
similarity index 100%
rename from multisrc/overrides/mymangacms/manhwa18net/src/Manhwa18Net.kt
rename to src/all/manhwa18net/src/eu/kanade/tachiyomi/extension/all/manhwa18net/Manhwa18Net.kt
diff --git a/src/all/manhwadashraw/build.gradle b/src/all/manhwadashraw/build.gradle
new file mode 100644
index 000000000..27baf6e0c
--- /dev/null
+++ b/src/all/manhwadashraw/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwa-raw'
+ extClass = '.ManhwaDashRaw'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwa-raw.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwadashraw/res/mipmap-hdpi/ic_launcher.png b/src/all/manhwadashraw/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwadashraw/res/mipmap-hdpi/ic_launcher.png
rename to src/all/manhwadashraw/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwadashraw/res/mipmap-mdpi/ic_launcher.png b/src/all/manhwadashraw/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwadashraw/res/mipmap-mdpi/ic_launcher.png
rename to src/all/manhwadashraw/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwadashraw/res/mipmap-xhdpi/ic_launcher.png b/src/all/manhwadashraw/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwadashraw/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/manhwadashraw/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwadashraw/res/mipmap-xxhdpi/ic_launcher.png b/src/all/manhwadashraw/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwadashraw/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/manhwadashraw/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwadashraw/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/manhwadashraw/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwadashraw/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/manhwadashraw/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwadashraw/src/ManhwaDashRaw.kt b/src/all/manhwadashraw/src/eu/kanade/tachiyomi/extension/all/manhwadashraw/ManhwaDashRaw.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwadashraw/src/ManhwaDashRaw.kt
rename to src/all/manhwadashraw/src/eu/kanade/tachiyomi/extension/all/manhwadashraw/ManhwaDashRaw.kt
diff --git a/src/all/metarthunter/build.gradle b/src/all/metarthunter/build.gradle
new file mode 100644
index 000000000..260a67747
--- /dev/null
+++ b/src/all/metarthunter/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Metart Hunter'
+ extClass = '.MetartHunter'
+ themePkg = 'masonry'
+ baseUrl = 'https://www.metarthunter.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/masonry/metarthunter/res/mipmap-hdpi/ic_launcher.png b/src/all/metarthunter/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/metarthunter/res/mipmap-hdpi/ic_launcher.png
rename to src/all/metarthunter/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/metarthunter/res/mipmap-mdpi/ic_launcher.png b/src/all/metarthunter/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/metarthunter/res/mipmap-mdpi/ic_launcher.png
rename to src/all/metarthunter/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/metarthunter/res/mipmap-xhdpi/ic_launcher.png b/src/all/metarthunter/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/metarthunter/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/metarthunter/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/metarthunter/res/mipmap-xxhdpi/ic_launcher.png b/src/all/metarthunter/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/metarthunter/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/metarthunter/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/metarthunter/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/metarthunter/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/metarthunter/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/metarthunter/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/all/metarthunter/src/eu/kanade/tachiyomi/extension/all/metarthunter/MetartHunter.kt b/src/all/metarthunter/src/eu/kanade/tachiyomi/extension/all/metarthunter/MetartHunter.kt
new file mode 100644
index 000000000..035091268
--- /dev/null
+++ b/src/all/metarthunter/src/eu/kanade/tachiyomi/extension/all/metarthunter/MetartHunter.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.all.metarthunter
+
+import eu.kanade.tachiyomi.multisrc.masonry.Masonry
+
+class MetartHunter : Masonry("Metart Hunter", "https://www.metarthunter.com", "all")
diff --git a/src/all/miauscan/build.gradle b/src/all/miauscan/build.gradle
new file mode 100644
index 000000000..481999e6a
--- /dev/null
+++ b/src/all/miauscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Miau Scan'
+ extClass = '.MiauScanFactory'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://miaucomics.org'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/miauscan/res/mipmap-hdpi/ic_launcher.png b/src/all/miauscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/miauscan/res/mipmap-hdpi/ic_launcher.png
rename to src/all/miauscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/miauscan/res/mipmap-mdpi/ic_launcher.png b/src/all/miauscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/miauscan/res/mipmap-mdpi/ic_launcher.png
rename to src/all/miauscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/miauscan/res/mipmap-xhdpi/ic_launcher.png b/src/all/miauscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/miauscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/miauscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/miauscan/res/mipmap-xxhdpi/ic_launcher.png b/src/all/miauscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/miauscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/miauscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/miauscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/miauscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/miauscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/miauscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/miauscan/src/MiauScanFactory.kt b/src/all/miauscan/src/eu/kanade/tachiyomi/extension/all/miauscan/MiauScanFactory.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/miauscan/src/MiauScanFactory.kt
rename to src/all/miauscan/src/eu/kanade/tachiyomi/extension/all/miauscan/MiauScanFactory.kt
diff --git a/src/all/mihentai/build.gradle b/src/all/mihentai/build.gradle
new file mode 100644
index 000000000..3a9eced65
--- /dev/null
+++ b/src/all/mihentai/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Mihentai'
+ extClass = '.Mihentai'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mihentai.com'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mihentai/res/mipmap-hdpi/ic_launcher.png b/src/all/mihentai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mihentai/res/mipmap-hdpi/ic_launcher.png
rename to src/all/mihentai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mihentai/res/mipmap-mdpi/ic_launcher.png b/src/all/mihentai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mihentai/res/mipmap-mdpi/ic_launcher.png
rename to src/all/mihentai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mihentai/res/mipmap-xhdpi/ic_launcher.png b/src/all/mihentai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mihentai/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/mihentai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mihentai/res/mipmap-xxhdpi/ic_launcher.png b/src/all/mihentai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mihentai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/mihentai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mihentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/mihentai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mihentai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/mihentai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mihentai/src/Mihentai.kt b/src/all/mihentai/src/eu/kanade/tachiyomi/extension/all/mihentai/Mihentai.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mihentai/src/Mihentai.kt
rename to src/all/mihentai/src/eu/kanade/tachiyomi/extension/all/mihentai/Mihentai.kt
diff --git a/src/all/myrockmanga/build.gradle b/src/all/myrockmanga/build.gradle
new file mode 100644
index 000000000..b4d954c40
--- /dev/null
+++ b/src/all/myrockmanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MyRockManga'
+ extClass = '.MyRockMangaFactory'
+ themePkg = 'otakusanctuary'
+ baseUrl = 'https://myrockmanga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/otakusanctuary/myrockmanga/res/mipmap-hdpi/ic_launcher.png b/src/all/myrockmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/otakusanctuary/myrockmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/all/myrockmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/otakusanctuary/myrockmanga/res/mipmap-mdpi/ic_launcher.png b/src/all/myrockmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/otakusanctuary/myrockmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/all/myrockmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/otakusanctuary/myrockmanga/res/mipmap-xhdpi/ic_launcher.png b/src/all/myrockmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/otakusanctuary/myrockmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/myrockmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/otakusanctuary/myrockmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/all/myrockmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/otakusanctuary/myrockmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/myrockmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/otakusanctuary/myrockmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/myrockmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/otakusanctuary/myrockmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/myrockmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/all/myrockmanga/src/eu/kanade/tachiyomi/extension/all/myrockmanga/MyRockMangaFactory.kt b/src/all/myrockmanga/src/eu/kanade/tachiyomi/extension/all/myrockmanga/MyRockMangaFactory.kt
new file mode 100644
index 000000000..faa69e764
--- /dev/null
+++ b/src/all/myrockmanga/src/eu/kanade/tachiyomi/extension/all/myrockmanga/MyRockMangaFactory.kt
@@ -0,0 +1,15 @@
+package eu.kanade.tachiyomi.extension.all.myrockmanga
+
+import eu.kanade.tachiyomi.multisrc.otakusanctuary.OtakuSanctuary
+import eu.kanade.tachiyomi.source.SourceFactory
+
+class MyRockMangaFactory : SourceFactory {
+ override fun createSources() = listOf(
+ OtakuSanctuary("MyRockManga", "https://myrockmanga.com", "all"),
+ OtakuSanctuary("MyRockManga", "https://myrockmanga.com", "vi"),
+ OtakuSanctuary("MyRockManga", "https://myrockmanga.com", "en"),
+ OtakuSanctuary("MyRockManga", "https://myrockmanga.com", "it"),
+ OtakuSanctuary("MyRockManga", "https://myrockmanga.com", "fr"),
+ OtakuSanctuary("MyRockManga", "https://myrockmanga.com", "es"),
+ )
+}
diff --git a/src/all/nhentaicom/build.gradle b/src/all/nhentaicom/build.gradle
new file mode 100644
index 000000000..863e91b8b
--- /dev/null
+++ b/src/all/nhentaicom/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'nHentai.com (unoriginal)'
+ extClass = '.NHentaiComFactory'
+ themePkg = 'hentaihand'
+ baseUrl = 'https://nhentai.com'
+ overrideVersionCode = 4
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/hentaihand/nhentaicom/res/mipmap-hdpi/ic_launcher.png b/src/all/nhentaicom/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/nhentaicom/res/mipmap-hdpi/ic_launcher.png
rename to src/all/nhentaicom/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/nhentaicom/res/mipmap-mdpi/ic_launcher.png b/src/all/nhentaicom/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/nhentaicom/res/mipmap-mdpi/ic_launcher.png
rename to src/all/nhentaicom/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/nhentaicom/res/mipmap-xhdpi/ic_launcher.png b/src/all/nhentaicom/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/nhentaicom/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/nhentaicom/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/nhentaicom/res/mipmap-xxhdpi/ic_launcher.png b/src/all/nhentaicom/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/nhentaicom/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/nhentaicom/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/nhentaicom/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/nhentaicom/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/nhentaicom/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/nhentaicom/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/nhentaicom/src/NHentaiComFactory.kt b/src/all/nhentaicom/src/eu/kanade/tachiyomi/extension/all/nhentaicom/NHentaiComFactory.kt
similarity index 100%
rename from multisrc/overrides/hentaihand/nhentaicom/src/NHentaiComFactory.kt
rename to src/all/nhentaicom/src/eu/kanade/tachiyomi/extension/all/nhentaicom/NHentaiComFactory.kt
diff --git a/src/all/otakusanctuary/build.gradle b/src/all/otakusanctuary/build.gradle
new file mode 100644
index 000000000..630fa3798
--- /dev/null
+++ b/src/all/otakusanctuary/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Otaku Sanctuary'
+ extClass = '.OtakuSanctuaryFactory'
+ themePkg = 'otakusanctuary'
+ baseUrl = 'https://otakusan.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/otakusanctuary/otakusanctuary/res/mipmap-hdpi/ic_launcher.png b/src/all/otakusanctuary/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/otakusanctuary/otakusanctuary/res/mipmap-hdpi/ic_launcher.png
rename to src/all/otakusanctuary/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/otakusanctuary/otakusanctuary/res/mipmap-mdpi/ic_launcher.png b/src/all/otakusanctuary/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/otakusanctuary/otakusanctuary/res/mipmap-mdpi/ic_launcher.png
rename to src/all/otakusanctuary/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/otakusanctuary/otakusanctuary/res/mipmap-xhdpi/ic_launcher.png b/src/all/otakusanctuary/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/otakusanctuary/otakusanctuary/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/otakusanctuary/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/otakusanctuary/otakusanctuary/res/mipmap-xxhdpi/ic_launcher.png b/src/all/otakusanctuary/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/otakusanctuary/otakusanctuary/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/otakusanctuary/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/otakusanctuary/otakusanctuary/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/otakusanctuary/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/otakusanctuary/otakusanctuary/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/otakusanctuary/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/all/otakusanctuary/src/eu/kanade/tachiyomi/extension/all/otakusanctuary/OtakuSanctuaryFactory.kt b/src/all/otakusanctuary/src/eu/kanade/tachiyomi/extension/all/otakusanctuary/OtakuSanctuaryFactory.kt
new file mode 100644
index 000000000..ba1b60d14
--- /dev/null
+++ b/src/all/otakusanctuary/src/eu/kanade/tachiyomi/extension/all/otakusanctuary/OtakuSanctuaryFactory.kt
@@ -0,0 +1,15 @@
+package eu.kanade.tachiyomi.extension.all.otakusanctuary
+
+import eu.kanade.tachiyomi.multisrc.otakusanctuary.OtakuSanctuary
+import eu.kanade.tachiyomi.source.SourceFactory
+
+class OtakuSanctuaryFactory : SourceFactory {
+ override fun createSources() = listOf(
+ OtakuSanctuary("Otaku Sanctuary", "https://otakusan.net", "all"),
+ OtakuSanctuary("Otaku Sanctuary", "https://otakusan.net", "vi"),
+ OtakuSanctuary("Otaku Sanctuary", "https://otakusan.net", "en"),
+ OtakuSanctuary("Otaku Sanctuary", "https://otakusan.net", "it"),
+ OtakuSanctuary("Otaku Sanctuary", "https://otakusan.net", "fr"),
+ OtakuSanctuary("Otaku Sanctuary", "https://otakusan.net", "es"),
+ )
+}
diff --git a/src/all/playmatehunter/build.gradle b/src/all/playmatehunter/build.gradle
new file mode 100644
index 000000000..4c58c9937
--- /dev/null
+++ b/src/all/playmatehunter/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Playmate Hunter'
+ extClass = '.PlaymateHunter'
+ themePkg = 'masonry'
+ baseUrl = 'https://pmatehunter.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/masonry/playmatehunter/res/mipmap-hdpi/ic_launcher.png b/src/all/playmatehunter/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/playmatehunter/res/mipmap-hdpi/ic_launcher.png
rename to src/all/playmatehunter/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/playmatehunter/res/mipmap-mdpi/ic_launcher.png b/src/all/playmatehunter/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/playmatehunter/res/mipmap-mdpi/ic_launcher.png
rename to src/all/playmatehunter/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/playmatehunter/res/mipmap-xhdpi/ic_launcher.png b/src/all/playmatehunter/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/playmatehunter/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/playmatehunter/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/playmatehunter/res/mipmap-xxhdpi/ic_launcher.png b/src/all/playmatehunter/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/playmatehunter/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/playmatehunter/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/playmatehunter/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/playmatehunter/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/playmatehunter/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/playmatehunter/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/all/playmatehunter/src/eu/kanade/tachiyomi/extension/all/playmatehunter/PlaymateHunter.kt b/src/all/playmatehunter/src/eu/kanade/tachiyomi/extension/all/playmatehunter/PlaymateHunter.kt
new file mode 100644
index 000000000..7dd389977
--- /dev/null
+++ b/src/all/playmatehunter/src/eu/kanade/tachiyomi/extension/all/playmatehunter/PlaymateHunter.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.all.playmatehunter
+
+import eu.kanade.tachiyomi.multisrc.masonry.Masonry
+
+class PlaymateHunter : Masonry("Playmate Hunter", "https://pmatehunter.com", "all")
diff --git a/src/all/ravensscans/build.gradle b/src/all/ravensscans/build.gradle
new file mode 100644
index 000000000..2dbef18f9
--- /dev/null
+++ b/src/all/ravensscans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Ravens Scans'
+ extClass = '.RavensScansFactory'
+ themePkg = 'readerfront'
+ baseUrl = 'https://ravens-scans.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/readerfront/ravensscans/res/mipmap-hdpi/ic_launcher.png b/src/all/ravensscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readerfront/ravensscans/res/mipmap-hdpi/ic_launcher.png
rename to src/all/ravensscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/readerfront/ravensscans/res/mipmap-mdpi/ic_launcher.png b/src/all/ravensscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readerfront/ravensscans/res/mipmap-mdpi/ic_launcher.png
rename to src/all/ravensscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/readerfront/ravensscans/res/mipmap-xhdpi/ic_launcher.png b/src/all/ravensscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readerfront/ravensscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/ravensscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readerfront/ravensscans/res/mipmap-xxhdpi/ic_launcher.png b/src/all/ravensscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readerfront/ravensscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/ravensscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readerfront/ravensscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/ravensscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readerfront/ravensscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/ravensscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readerfront/ravensscans/src/RavensScansFactory.kt b/src/all/ravensscans/src/eu/kanade/tachiyomi/extension/all/ravensscans/RavensScansFactory.kt
similarity index 100%
rename from multisrc/overrides/readerfront/ravensscans/src/RavensScansFactory.kt
rename to src/all/ravensscans/src/eu/kanade/tachiyomi/extension/all/ravensscans/RavensScansFactory.kt
diff --git a/src/all/thunderscans/build.gradle b/src/all/thunderscans/build.gradle
new file mode 100644
index 000000000..f4c19e2e1
--- /dev/null
+++ b/src/all/thunderscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Thunder Scans'
+ extClass = '.ThunderScansFactory'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://thunderscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/thunderscans/res/mipmap-hdpi/ic_launcher.png b/src/all/thunderscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/thunderscans/res/mipmap-hdpi/ic_launcher.png
rename to src/all/thunderscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/thunderscans/res/mipmap-mdpi/ic_launcher.png b/src/all/thunderscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/thunderscans/res/mipmap-mdpi/ic_launcher.png
rename to src/all/thunderscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/thunderscans/res/mipmap-xhdpi/ic_launcher.png b/src/all/thunderscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/thunderscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/thunderscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/thunderscans/res/mipmap-xxhdpi/ic_launcher.png b/src/all/thunderscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/thunderscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/thunderscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/thunderscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/thunderscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/thunderscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/thunderscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/thunderscans/src/ThunderScansFactory.kt b/src/all/thunderscans/src/eu/kanade/tachiyomi/extension/all/thunderscans/ThunderScansFactory.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/thunderscans/src/ThunderScansFactory.kt
rename to src/all/thunderscans/src/eu/kanade/tachiyomi/extension/all/thunderscans/ThunderScansFactory.kt
diff --git a/multisrc/overrides/webtoons/webtoons/AndroidManifest.xml b/src/all/webtoons/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/webtoons/webtoons/AndroidManifest.xml
rename to src/all/webtoons/AndroidManifest.xml
diff --git a/src/all/webtoons/build.gradle b/src/all/webtoons/build.gradle
new file mode 100644
index 000000000..c3fe02a78
--- /dev/null
+++ b/src/all/webtoons/build.gradle
@@ -0,0 +1,13 @@
+ext {
+ extName = 'Webtoons.com'
+ extClass = '.WebtoonsFactory'
+ themePkg = 'webtoons'
+ baseUrl = 'https://www.webtoons.com'
+ overrideVersionCode = 39
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+ implementation(project(':lib:textinterceptor'))
+}
diff --git a/multisrc/overrides/webtoons/webtoons/src/WebtoonsFactory.kt b/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsFactory.kt
similarity index 100%
rename from multisrc/overrides/webtoons/webtoons/src/WebtoonsFactory.kt
rename to src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsFactory.kt
diff --git a/multisrc/overrides/webtoons/webtoons/src/WebtoonsSrc.kt b/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsSrc.kt
similarity index 100%
rename from multisrc/overrides/webtoons/webtoons/src/WebtoonsSrc.kt
rename to src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsSrc.kt
diff --git a/src/all/webtoonstranslate/build.gradle b/src/all/webtoonstranslate/build.gradle
new file mode 100644
index 000000000..ce9b33854
--- /dev/null
+++ b/src/all/webtoonstranslate/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Webtoons.com Translations'
+ extClass = '.WebtoonsTranslateFactory'
+ themePkg = 'webtoons'
+ baseUrl = 'https://translate.webtoons.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/webtoons/webtoonstranslate/src/WebtoonsTranslateFactory.kt b/src/all/webtoonstranslate/src/eu/kanade/tachiyomi/extension/all/webtoonstranslate/WebtoonsTranslateFactory.kt
similarity index 100%
rename from multisrc/overrides/webtoons/webtoonstranslate/src/WebtoonsTranslateFactory.kt
rename to src/all/webtoonstranslate/src/eu/kanade/tachiyomi/extension/all/webtoonstranslate/WebtoonsTranslateFactory.kt
diff --git a/src/all/xarthunter/build.gradle b/src/all/xarthunter/build.gradle
new file mode 100644
index 000000000..63f3ed300
--- /dev/null
+++ b/src/all/xarthunter/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'XArt Hunter'
+ extClass = '.XArtHunter'
+ themePkg = 'masonry'
+ baseUrl = 'https://www.xarthunter.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/masonry/xarthunter/res/mipmap-hdpi/ic_launcher.png b/src/all/xarthunter/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/xarthunter/res/mipmap-hdpi/ic_launcher.png
rename to src/all/xarthunter/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/xarthunter/res/mipmap-mdpi/ic_launcher.png b/src/all/xarthunter/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/xarthunter/res/mipmap-mdpi/ic_launcher.png
rename to src/all/xarthunter/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/xarthunter/res/mipmap-xhdpi/ic_launcher.png b/src/all/xarthunter/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/xarthunter/res/mipmap-xhdpi/ic_launcher.png
rename to src/all/xarthunter/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/xarthunter/res/mipmap-xxhdpi/ic_launcher.png b/src/all/xarthunter/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/xarthunter/res/mipmap-xxhdpi/ic_launcher.png
rename to src/all/xarthunter/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/masonry/xarthunter/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/xarthunter/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/masonry/xarthunter/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/all/xarthunter/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/all/xarthunter/src/eu/kanade/tachiyomi/extension/all/xarthunter/XArtHunter.kt b/src/all/xarthunter/src/eu/kanade/tachiyomi/extension/all/xarthunter/XArtHunter.kt
new file mode 100644
index 000000000..efa04b00d
--- /dev/null
+++ b/src/all/xarthunter/src/eu/kanade/tachiyomi/extension/all/xarthunter/XArtHunter.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.all.xarthunter
+
+import eu.kanade.tachiyomi.multisrc.masonry.Masonry
+
+class XArtHunter : Masonry("XArt Hunter", "https://www.xarthunter.com", "all")
diff --git a/src/ar/arabtoons/build.gradle b/src/ar/arabtoons/build.gradle
new file mode 100644
index 000000000..3dd9fe45a
--- /dev/null
+++ b/src/ar/arabtoons/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Arab Toons'
+ extClass = '.ArabToons'
+ themePkg = 'madara'
+ baseUrl = 'https://arabtoons.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/arabtoons/res/mipmap-hdpi/ic_launcher.png b/src/ar/arabtoons/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arabtoons/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/arabtoons/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arabtoons/res/mipmap-mdpi/ic_launcher.png b/src/ar/arabtoons/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arabtoons/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/arabtoons/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arabtoons/res/mipmap-xhdpi/ic_launcher.png b/src/ar/arabtoons/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arabtoons/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/arabtoons/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arabtoons/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/arabtoons/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arabtoons/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/arabtoons/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arabtoons/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/arabtoons/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arabtoons/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/arabtoons/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arabtoons/src/ArabToons.kt b/src/ar/arabtoons/src/eu/kanade/tachiyomi/extension/ar/arabtoons/ArabToons.kt
similarity index 100%
rename from multisrc/overrides/madara/arabtoons/src/ArabToons.kt
rename to src/ar/arabtoons/src/eu/kanade/tachiyomi/extension/ar/arabtoons/ArabToons.kt
diff --git a/src/ar/areamanga/build.gradle b/src/ar/areamanga/build.gradle
new file mode 100644
index 000000000..4dc21020c
--- /dev/null
+++ b/src/ar/areamanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Area Manga'
+ extClass = '.AreaManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://www.areascans.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/areamanga/res/mipmap-hdpi/ic_launcher.png b/src/ar/areamanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/areamanga/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/areamanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/areamanga/res/mipmap-mdpi/ic_launcher.png b/src/ar/areamanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/areamanga/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/areamanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/areamanga/res/mipmap-xhdpi/ic_launcher.png b/src/ar/areamanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/areamanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/areamanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/areamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/areamanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/areamanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/areamanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/areamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/areamanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/areamanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/areamanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/areamanga/src/AreaManga.kt b/src/ar/areamanga/src/eu/kanade/tachiyomi/extension/ar/areamanga/AreaManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/areamanga/src/AreaManga.kt
rename to src/ar/areamanga/src/eu/kanade/tachiyomi/extension/ar/areamanga/AreaManga.kt
diff --git a/src/ar/aresnov/build.gradle b/src/ar/aresnov/build.gradle
new file mode 100644
index 000000000..36f1785a6
--- /dev/null
+++ b/src/ar/aresnov/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ARESNOV'
+ extClass = '.ARESNOV'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://aresnov.org'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/aresnov/res/mipmap-hdpi/ic_launcher.png b/src/ar/aresnov/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/aresnov/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/aresnov/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/aresnov/res/mipmap-mdpi/ic_launcher.png b/src/ar/aresnov/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/aresnov/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/aresnov/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/aresnov/res/mipmap-xhdpi/ic_launcher.png b/src/ar/aresnov/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/aresnov/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/aresnov/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/aresnov/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/aresnov/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/aresnov/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/aresnov/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/aresnov/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/aresnov/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/aresnov/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/aresnov/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/aresnov/src/ARESNOV.kt b/src/ar/aresnov/src/eu/kanade/tachiyomi/extension/ar/aresnov/ARESNOV.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/aresnov/src/ARESNOV.kt
rename to src/ar/aresnov/src/eu/kanade/tachiyomi/extension/ar/aresnov/ARESNOV.kt
diff --git a/src/ar/azora/build.gradle b/src/ar/azora/build.gradle
new file mode 100644
index 000000000..c670993dd
--- /dev/null
+++ b/src/ar/azora/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Azora'
+ extClass = '.Azora'
+ themePkg = 'madara'
+ baseUrl = 'https://azoramoon.com'
+ overrideVersionCode = 7
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/azora/res/mipmap-hdpi/ic_launcher.png b/src/ar/azora/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/azora/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/azora/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/azora/res/mipmap-mdpi/ic_launcher.png b/src/ar/azora/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/azora/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/azora/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/azora/res/mipmap-xhdpi/ic_launcher.png b/src/ar/azora/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/azora/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/azora/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/azora/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/azora/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/azora/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/azora/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/azora/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/azora/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/azora/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/azora/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/azora/src/Azora.kt b/src/ar/azora/src/eu/kanade/tachiyomi/extension/ar/azora/Azora.kt
similarity index 100%
rename from multisrc/overrides/madara/azora/src/Azora.kt
rename to src/ar/azora/src/eu/kanade/tachiyomi/extension/ar/azora/Azora.kt
diff --git a/src/ar/beastscans/build.gradle b/src/ar/beastscans/build.gradle
new file mode 100644
index 000000000..c7c5ef323
--- /dev/null
+++ b/src/ar/beastscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Beast Scans'
+ extClass = '.BeastScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://beastscans.net'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/beastscans/res/mipmap-hdpi/ic_launcher.png b/src/ar/beastscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/beastscans/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/beastscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/beastscans/res/mipmap-mdpi/ic_launcher.png b/src/ar/beastscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/beastscans/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/beastscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/beastscans/res/mipmap-xhdpi/ic_launcher.png b/src/ar/beastscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/beastscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/beastscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/beastscans/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/beastscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/beastscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/beastscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/beastscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/beastscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/beastscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/beastscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/beastscans/src/BeastScans.kt b/src/ar/beastscans/src/eu/kanade/tachiyomi/extension/ar/beastscans/BeastScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/beastscans/src/BeastScans.kt
rename to src/ar/beastscans/src/eu/kanade/tachiyomi/extension/ar/beastscans/BeastScans.kt
diff --git a/src/ar/comicarab/build.gradle b/src/ar/comicarab/build.gradle
new file mode 100644
index 000000000..0ad65ad96
--- /dev/null
+++ b/src/ar/comicarab/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Comic Arab'
+ extClass = '.ComicArab'
+ themePkg = 'madara'
+ baseUrl = 'https://comicarab.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/comicarab/res/mipmap-hdpi/ic_launcher.png b/src/ar/comicarab/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicarab/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/comicarab/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicarab/res/mipmap-mdpi/ic_launcher.png b/src/ar/comicarab/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicarab/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/comicarab/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicarab/res/mipmap-xhdpi/ic_launcher.png b/src/ar/comicarab/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicarab/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/comicarab/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicarab/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/comicarab/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicarab/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/comicarab/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicarab/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/comicarab/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicarab/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/comicarab/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicarab/src/ComicArab.kt b/src/ar/comicarab/src/eu/kanade/tachiyomi/extension/ar/comicarab/ComicArab.kt
similarity index 100%
rename from multisrc/overrides/madara/comicarab/src/ComicArab.kt
rename to src/ar/comicarab/src/eu/kanade/tachiyomi/extension/ar/comicarab/ComicArab.kt
diff --git a/src/ar/detectiveconanar/build.gradle b/src/ar/detectiveconanar/build.gradle
new file mode 100644
index 000000000..5076892c5
--- /dev/null
+++ b/src/ar/detectiveconanar/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Detective Conan Ar'
+ extClass = '.DetectiveConanAr'
+ themePkg = 'madara'
+ baseUrl = 'https://manga.detectiveconanar.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/detectiveconanar/res/mipmap-hdpi/ic_launcher.png b/src/ar/detectiveconanar/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/detectiveconanar/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/detectiveconanar/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/detectiveconanar/res/mipmap-mdpi/ic_launcher.png b/src/ar/detectiveconanar/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/detectiveconanar/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/detectiveconanar/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/detectiveconanar/res/mipmap-xhdpi/ic_launcher.png b/src/ar/detectiveconanar/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/detectiveconanar/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/detectiveconanar/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/detectiveconanar/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/detectiveconanar/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/detectiveconanar/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/detectiveconanar/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/detectiveconanar/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/detectiveconanar/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/detectiveconanar/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/detectiveconanar/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/ar/detectiveconanar/src/eu/kanade/tachiyomi/extension/ar/detectiveconanar/DetectiveConanAr.kt b/src/ar/detectiveconanar/src/eu/kanade/tachiyomi/extension/ar/detectiveconanar/DetectiveConanAr.kt
new file mode 100644
index 000000000..745fbc375
--- /dev/null
+++ b/src/ar/detectiveconanar/src/eu/kanade/tachiyomi/extension/ar/detectiveconanar/DetectiveConanAr.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.ar.detectiveconanar
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class DetectiveConanAr : Madara("شبكة كونان العربية", "https://manga.detectiveconanar.com", "ar")
diff --git a/src/ar/empirewebtoon/build.gradle b/src/ar/empirewebtoon/build.gradle
new file mode 100644
index 000000000..bfcef7e7d
--- /dev/null
+++ b/src/ar/empirewebtoon/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Empire Webtoon'
+ extClass = '.EmpireWebtoon'
+ themePkg = 'madara'
+ baseUrl = 'https://webtoonsempireron.com'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/empirewebtoon/res/mipmap-hdpi/ic_launcher.png b/src/ar/empirewebtoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/empirewebtoon/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/empirewebtoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/empirewebtoon/res/mipmap-mdpi/ic_launcher.png b/src/ar/empirewebtoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/empirewebtoon/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/empirewebtoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/empirewebtoon/res/mipmap-xhdpi/ic_launcher.png b/src/ar/empirewebtoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/empirewebtoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/empirewebtoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/empirewebtoon/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/empirewebtoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/empirewebtoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/empirewebtoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/empirewebtoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/empirewebtoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/empirewebtoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/empirewebtoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/empirewebtoon/src/EmpireWebtoon.kt b/src/ar/empirewebtoon/src/eu/kanade/tachiyomi/extension/ar/empirewebtoon/EmpireWebtoon.kt
similarity index 100%
rename from multisrc/overrides/madara/empirewebtoon/src/EmpireWebtoon.kt
rename to src/ar/empirewebtoon/src/eu/kanade/tachiyomi/extension/ar/empirewebtoon/EmpireWebtoon.kt
diff --git a/src/ar/galaxymanga/build.gradle b/src/ar/galaxymanga/build.gradle
new file mode 100644
index 000000000..07f44aafd
--- /dev/null
+++ b/src/ar/galaxymanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Galaxy Manga'
+ extClass = '.GalaxyManga'
+ themePkg = 'flixscans'
+ baseUrl = 'https://flixscans.com'
+ overrideVersionCode = 26
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/flixscans/galaxymanga/res/mipmap-hdpi/ic_launcher.png b/src/ar/galaxymanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/flixscans/galaxymanga/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/galaxymanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/flixscans/galaxymanga/res/mipmap-mdpi/ic_launcher.png b/src/ar/galaxymanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/flixscans/galaxymanga/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/galaxymanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/flixscans/galaxymanga/res/mipmap-xhdpi/ic_launcher.png b/src/ar/galaxymanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/flixscans/galaxymanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/galaxymanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/flixscans/galaxymanga/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/galaxymanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/flixscans/galaxymanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/galaxymanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/flixscans/galaxymanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/galaxymanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/flixscans/galaxymanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/galaxymanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/flixscans/galaxymanga/src/GalaxyManga.kt b/src/ar/galaxymanga/src/eu/kanade/tachiyomi/extension/ar/galaxymanga/GalaxyManga.kt
similarity index 100%
rename from multisrc/overrides/flixscans/galaxymanga/src/GalaxyManga.kt
rename to src/ar/galaxymanga/src/eu/kanade/tachiyomi/extension/ar/galaxymanga/GalaxyManga.kt
diff --git a/src/ar/gatemanga/build.gradle b/src/ar/gatemanga/build.gradle
new file mode 100644
index 000000000..a12a6cd78
--- /dev/null
+++ b/src/ar/gatemanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Gatemanga'
+ extClass = '.Gatemanga'
+ themePkg = 'madara'
+ baseUrl = 'https://gatemanga.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/gatemanga/res/mipmap-hdpi/ic_launcher.png b/src/ar/gatemanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gatemanga/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/gatemanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gatemanga/res/mipmap-mdpi/ic_launcher.png b/src/ar/gatemanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gatemanga/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/gatemanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gatemanga/res/mipmap-xhdpi/ic_launcher.png b/src/ar/gatemanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gatemanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/gatemanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gatemanga/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/gatemanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gatemanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/gatemanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gatemanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/gatemanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gatemanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/gatemanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gatemanga/src/Gatemanga.kt b/src/ar/gatemanga/src/eu/kanade/tachiyomi/extension/ar/gatemanga/Gatemanga.kt
similarity index 100%
rename from multisrc/overrides/madara/gatemanga/src/Gatemanga.kt
rename to src/ar/gatemanga/src/eu/kanade/tachiyomi/extension/ar/gatemanga/Gatemanga.kt
diff --git a/src/ar/hijala/build.gradle b/src/ar/hijala/build.gradle
new file mode 100644
index 000000000..53e3e0202
--- /dev/null
+++ b/src/ar/hijala/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Hijala'
+ extClass = '.Hijala'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://hijala.blogspot.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/hijala/res/mipmap-hdpi/ic_launcher.png b/src/ar/hijala/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/hijala/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/hijala/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/hijala/res/mipmap-mdpi/ic_launcher.png b/src/ar/hijala/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/hijala/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/hijala/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/hijala/res/mipmap-xhdpi/ic_launcher.png b/src/ar/hijala/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/hijala/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/hijala/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/hijala/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/hijala/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/hijala/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/hijala/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/hijala/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/hijala/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/hijala/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/hijala/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/hijala/src/Hijala.kt b/src/ar/hijala/src/eu/kanade/tachiyomi/extension/ar/hijala/Hijala.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/hijala/src/Hijala.kt
rename to src/ar/hijala/src/eu/kanade/tachiyomi/extension/ar/hijala/Hijala.kt
diff --git a/src/ar/hizomanga/build.gradle b/src/ar/hizomanga/build.gradle
new file mode 100644
index 000000000..cb255b556
--- /dev/null
+++ b/src/ar/hizomanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Hizomanga'
+ extClass = '.Hizomanga'
+ themePkg = 'madara'
+ baseUrl = 'https://hizomanga.me'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hizomanga/res/mipmap-hdpi/ic_launcher.png b/src/ar/hizomanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hizomanga/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/hizomanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hizomanga/res/mipmap-mdpi/ic_launcher.png b/src/ar/hizomanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hizomanga/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/hizomanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hizomanga/res/mipmap-xhdpi/ic_launcher.png b/src/ar/hizomanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hizomanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/hizomanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hizomanga/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/hizomanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hizomanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/hizomanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hizomanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/hizomanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hizomanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/hizomanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/ar/hizomanga/src/eu/kanade/tachiyomi/extension/ar/hizomanga/Hizomanga.kt b/src/ar/hizomanga/src/eu/kanade/tachiyomi/extension/ar/hizomanga/Hizomanga.kt
new file mode 100644
index 000000000..2f195b118
--- /dev/null
+++ b/src/ar/hizomanga/src/eu/kanade/tachiyomi/extension/ar/hizomanga/Hizomanga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.ar.hizomanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Hizomanga : Madara("Hizomanga", "https://hizomanga.me", "ar")
diff --git a/src/ar/iimanga/build.gradle b/src/ar/iimanga/build.gradle
new file mode 100644
index 000000000..d5c60733c
--- /dev/null
+++ b/src/ar/iimanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ARESManga'
+ extClass = '.ARESManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://en-aresmanga.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/iimanga/res/mipmap-hdpi/ic_launcher.png b/src/ar/iimanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/iimanga/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/iimanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/iimanga/res/mipmap-mdpi/ic_launcher.png b/src/ar/iimanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/iimanga/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/iimanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/iimanga/res/mipmap-xhdpi/ic_launcher.png b/src/ar/iimanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/iimanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/iimanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/iimanga/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/iimanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/iimanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/iimanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/iimanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/iimanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/iimanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/iimanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/iimanga/src/ARESManga.kt b/src/ar/iimanga/src/eu/kanade/tachiyomi/extension/ar/iimanga/ARESManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/iimanga/src/ARESManga.kt
rename to src/ar/iimanga/src/eu/kanade/tachiyomi/extension/ar/iimanga/ARESManga.kt
diff --git a/src/ar/kingofshojo/build.gradle b/src/ar/kingofshojo/build.gradle
new file mode 100644
index 000000000..66362a9fa
--- /dev/null
+++ b/src/ar/kingofshojo/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'King of Shojo'
+ extClass = '.KingofShojo'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://kingofshojo.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/kingofshojo/res/mipmap-hdpi/ic_launcher.png b/src/ar/kingofshojo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kingofshojo/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/kingofshojo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kingofshojo/res/mipmap-mdpi/ic_launcher.png b/src/ar/kingofshojo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kingofshojo/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/kingofshojo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kingofshojo/res/mipmap-xhdpi/ic_launcher.png b/src/ar/kingofshojo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kingofshojo/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/kingofshojo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kingofshojo/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/kingofshojo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kingofshojo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/kingofshojo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kingofshojo/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/kingofshojo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kingofshojo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/kingofshojo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kingofshojo/src/KingofShojo.kt b/src/ar/kingofshojo/src/eu/kanade/tachiyomi/extension/ar/kingofshojo/KingofShojo.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/kingofshojo/src/KingofShojo.kt
rename to src/ar/kingofshojo/src/eu/kanade/tachiyomi/extension/ar/kingofshojo/KingofShojo.kt
diff --git a/src/ar/lonertranslations/build.gradle b/src/ar/lonertranslations/build.gradle
new file mode 100644
index 000000000..8c5d01547
--- /dev/null
+++ b/src/ar/lonertranslations/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Loner Translations'
+ extClass = '.LonerTranslations'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://loner-tl.blogspot.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/lonertranslations/res/mipmap-hdpi/ic_launcher.png b/src/ar/lonertranslations/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/lonertranslations/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/lonertranslations/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/lonertranslations/res/mipmap-mdpi/ic_launcher.png b/src/ar/lonertranslations/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/lonertranslations/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/lonertranslations/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/lonertranslations/res/mipmap-xhdpi/ic_launcher.png b/src/ar/lonertranslations/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/lonertranslations/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/lonertranslations/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/lonertranslations/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/lonertranslations/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/lonertranslations/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/lonertranslations/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/lonertranslations/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/lonertranslations/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/lonertranslations/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/lonertranslations/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/ar/lonertranslations/src/eu/kanade/tachiyomi/extension/ar/lonertranslations/LonerTranslations.kt b/src/ar/lonertranslations/src/eu/kanade/tachiyomi/extension/ar/lonertranslations/LonerTranslations.kt
new file mode 100644
index 000000000..b3a98741f
--- /dev/null
+++ b/src/ar/lonertranslations/src/eu/kanade/tachiyomi/extension/ar/lonertranslations/LonerTranslations.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.ar.lonertranslations
+
+import eu.kanade.tachiyomi.multisrc.zeistmanga.ZeistManga
+
+class LonerTranslations : ZeistManga("Loner Translations", "https://loner-tl.blogspot.com", "ar")
diff --git a/src/ar/manga3asq/build.gradle b/src/ar/manga3asq/build.gradle
new file mode 100644
index 000000000..a1c1ad567
--- /dev/null
+++ b/src/ar/manga3asq/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = '3asq'
+ extClass = '.Manga3asq'
+ themePkg = 'madara'
+ baseUrl = 'https://3asq.org'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manga3asq/res/mipmap-hdpi/ic_launcher.png b/src/ar/manga3asq/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga3asq/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/manga3asq/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga3asq/res/mipmap-mdpi/ic_launcher.png b/src/ar/manga3asq/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga3asq/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/manga3asq/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga3asq/res/mipmap-xhdpi/ic_launcher.png b/src/ar/manga3asq/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga3asq/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/manga3asq/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga3asq/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/manga3asq/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga3asq/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/manga3asq/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga3asq/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/manga3asq/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga3asq/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/manga3asq/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga3asq/src/Manga3asq.kt b/src/ar/manga3asq/src/eu/kanade/tachiyomi/extension/ar/manga3asq/Manga3asq.kt
similarity index 100%
rename from multisrc/overrides/madara/manga3asq/src/Manga3asq.kt
rename to src/ar/manga3asq/src/eu/kanade/tachiyomi/extension/ar/manga3asq/Manga3asq.kt
diff --git a/src/ar/mangaailand/build.gradle b/src/ar/mangaailand/build.gradle
new file mode 100644
index 000000000..18b84a920
--- /dev/null
+++ b/src/ar/mangaailand/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Ai Land'
+ extClass = '.MangaAiLand'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://manga-ai-land.blogspot.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/mangaailand/res/mipmap-hdpi/ic_launcher.png b/src/ar/mangaailand/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mangaailand/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/mangaailand/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mangaailand/res/mipmap-mdpi/ic_launcher.png b/src/ar/mangaailand/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mangaailand/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/mangaailand/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mangaailand/res/mipmap-xhdpi/ic_launcher.png b/src/ar/mangaailand/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mangaailand/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/mangaailand/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mangaailand/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/mangaailand/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mangaailand/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/mangaailand/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mangaailand/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/mangaailand/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mangaailand/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/mangaailand/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mangaailand/src/MangaAiLand.kt b/src/ar/mangaailand/src/eu/kanade/tachiyomi/extension/ar/mangaailand/MangaAiLand.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/mangaailand/src/MangaAiLand.kt
rename to src/ar/mangaailand/src/eu/kanade/tachiyomi/extension/ar/mangaailand/MangaAiLand.kt
diff --git a/src/ar/mangaflame/build.gradle b/src/ar/mangaflame/build.gradle
new file mode 100644
index 000000000..1ace662d3
--- /dev/null
+++ b/src/ar/mangaflame/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Flame'
+ extClass = '.MangaFlame'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangaflame.org'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangaflame/res/mipmap-hdpi/ic_launcher.png b/src/ar/mangaflame/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaflame/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/mangaflame/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaflame/res/mipmap-mdpi/ic_launcher.png b/src/ar/mangaflame/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaflame/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/mangaflame/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaflame/res/mipmap-xhdpi/ic_launcher.png b/src/ar/mangaflame/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaflame/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/mangaflame/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaflame/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/mangaflame/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaflame/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/mangaflame/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaflame/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/mangaflame/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaflame/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/mangaflame/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaflame/src/MangaFlame.kt b/src/ar/mangaflame/src/eu/kanade/tachiyomi/extension/ar/mangaflame/MangaFlame.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaflame/src/MangaFlame.kt
rename to src/ar/mangaflame/src/eu/kanade/tachiyomi/extension/ar/mangaflame/MangaFlame.kt
diff --git a/src/ar/mangalek/build.gradle b/src/ar/mangalek/build.gradle
new file mode 100644
index 000000000..6349c9bb3
--- /dev/null
+++ b/src/ar/mangalek/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangalek'
+ extClass = '.Mangalek'
+ themePkg = 'madara'
+ baseUrl = 'https://manga-lek.net'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangalek/res/mipmap-hdpi/ic_launcher.png b/src/ar/mangalek/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalek/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/mangalek/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalek/res/mipmap-mdpi/ic_launcher.png b/src/ar/mangalek/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalek/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/mangalek/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalek/res/mipmap-xhdpi/ic_launcher.png b/src/ar/mangalek/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalek/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/mangalek/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalek/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/mangalek/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalek/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/mangalek/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalek/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/mangalek/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalek/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/mangalek/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalek/src/Mangalek.kt b/src/ar/mangalek/src/eu/kanade/tachiyomi/extension/ar/mangalek/Mangalek.kt
similarity index 100%
rename from multisrc/overrides/madara/mangalek/src/Mangalek.kt
rename to src/ar/mangalek/src/eu/kanade/tachiyomi/extension/ar/mangalek/Mangalek.kt
diff --git a/src/ar/mangalink/build.gradle b/src/ar/mangalink/build.gradle
new file mode 100644
index 000000000..03350b9ac
--- /dev/null
+++ b/src/ar/mangalink/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangalink'
+ extClass = '.Mangalink'
+ themePkg = 'madara'
+ baseUrl = 'https://manga-link.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangalink/res/mipmap-hdpi/ic_launcher.png b/src/ar/mangalink/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalink/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/mangalink/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalink/res/mipmap-mdpi/ic_launcher.png b/src/ar/mangalink/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalink/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/mangalink/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalink/res/mipmap-xhdpi/ic_launcher.png b/src/ar/mangalink/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalink/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/mangalink/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalink/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/mangalink/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalink/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/mangalink/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalink/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/mangalink/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalink/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/mangalink/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalink/src/Mangalink.kt b/src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/Mangalink.kt
similarity index 100%
rename from multisrc/overrides/madara/mangalink/src/Mangalink.kt
rename to src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/Mangalink.kt
diff --git a/src/ar/mangalionz/build.gradle b/src/ar/mangalionz/build.gradle
new file mode 100644
index 000000000..de1228435
--- /dev/null
+++ b/src/ar/mangalionz/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaLionz'
+ extClass = '.MangaLionz'
+ themePkg = 'madara'
+ baseUrl = 'https://mangalionz.org'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangalionz/res/mipmap-hdpi/ic_launcher.png b/src/ar/mangalionz/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalionz/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/mangalionz/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalionz/res/mipmap-mdpi/ic_launcher.png b/src/ar/mangalionz/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalionz/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/mangalionz/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalionz/res/mipmap-xhdpi/ic_launcher.png b/src/ar/mangalionz/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalionz/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/mangalionz/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalionz/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/mangalionz/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalionz/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/mangalionz/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalionz/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/mangalionz/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangalionz/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/mangalionz/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangalionz/src/MangaLionz.kt b/src/ar/mangalionz/src/eu/kanade/tachiyomi/extension/ar/mangalionz/MangaLionz.kt
similarity index 100%
rename from multisrc/overrides/madara/mangalionz/src/MangaLionz.kt
rename to src/ar/mangalionz/src/eu/kanade/tachiyomi/extension/ar/mangalionz/MangaLionz.kt
diff --git a/src/ar/manganoon/build.gradle b/src/ar/manganoon/build.gradle
new file mode 100644
index 000000000..08465c27a
--- /dev/null
+++ b/src/ar/manganoon/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaNoon'
+ extClass = '.MangaNoon'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://manjanoon.net'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/manganoon/res/mipmap-hdpi/ic_launcher.png b/src/ar/manganoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manganoon/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/manganoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manganoon/res/mipmap-mdpi/ic_launcher.png b/src/ar/manganoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manganoon/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/manganoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manganoon/res/mipmap-xhdpi/ic_launcher.png b/src/ar/manganoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manganoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/manganoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manganoon/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/manganoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manganoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/manganoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manganoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/manganoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manganoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/manganoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manganoon/src/MangaNoon.kt b/src/ar/manganoon/src/eu/kanade/tachiyomi/extension/ar/manganoon/MangaNoon.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/manganoon/src/MangaNoon.kt
rename to src/ar/manganoon/src/eu/kanade/tachiyomi/extension/ar/manganoon/MangaNoon.kt
diff --git a/src/ar/mangapro/build.gradle b/src/ar/mangapro/build.gradle
new file mode 100644
index 000000000..fb60e46ef
--- /dev/null
+++ b/src/ar/mangapro/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Pro'
+ extClass = '.MangaPro'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangapro.pro'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangapro/res/mipmap-hdpi/ic_launcher.png b/src/ar/mangapro/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangapro/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/mangapro/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangapro/res/mipmap-mdpi/ic_launcher.png b/src/ar/mangapro/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangapro/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/mangapro/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangapro/res/mipmap-xhdpi/ic_launcher.png b/src/ar/mangapro/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangapro/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/mangapro/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangapro/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/mangapro/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangapro/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/mangapro/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangapro/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/mangapro/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangapro/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/mangapro/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangapro/src/MangaPro.kt b/src/ar/mangapro/src/eu/kanade/tachiyomi/extension/ar/mangapro/MangaPro.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangapro/src/MangaPro.kt
rename to src/ar/mangapro/src/eu/kanade/tachiyomi/extension/ar/mangapro/MangaPro.kt
diff --git a/src/ar/mangarabic/build.gradle b/src/ar/mangarabic/build.gradle
new file mode 100644
index 000000000..8baafd0d7
--- /dev/null
+++ b/src/ar/mangarabic/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaRabic'
+ extClass = '.MangaRabic'
+ themePkg = 'madara'
+ baseUrl = 'https://mangarabic.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/ar/mangarabic/src/eu/kanade/tachiyomi/extension/ar/mangarabic/MangaRabic.kt b/src/ar/mangarabic/src/eu/kanade/tachiyomi/extension/ar/mangarabic/MangaRabic.kt
new file mode 100644
index 000000000..c875b4daf
--- /dev/null
+++ b/src/ar/mangarabic/src/eu/kanade/tachiyomi/extension/ar/mangarabic/MangaRabic.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.ar.mangarabic
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaRabic : Madara("MangaRabic", "https://mangarabic.com", "ar")
diff --git a/src/ar/mangarose/build.gradle b/src/ar/mangarose/build.gradle
new file mode 100644
index 000000000..046371875
--- /dev/null
+++ b/src/ar/mangarose/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Rose'
+ extClass = '.MangaRose'
+ themePkg = 'madara'
+ baseUrl = 'https://mangarose.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangarose/res/mipmap-hdpi/ic_launcher.png b/src/ar/mangarose/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarose/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/mangarose/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarose/res/mipmap-mdpi/ic_launcher.png b/src/ar/mangarose/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarose/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/mangarose/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarose/res/mipmap-xhdpi/ic_launcher.png b/src/ar/mangarose/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarose/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/mangarose/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarose/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/mangarose/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarose/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/mangarose/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarose/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/mangarose/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarose/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/mangarose/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarose/src/MangaRose.kt b/src/ar/mangarose/src/eu/kanade/tachiyomi/extension/ar/mangarose/MangaRose.kt
similarity index 100%
rename from multisrc/overrides/madara/mangarose/src/MangaRose.kt
rename to src/ar/mangarose/src/eu/kanade/tachiyomi/extension/ar/mangarose/MangaRose.kt
diff --git a/src/ar/mangasoul/build.gradle b/src/ar/mangasoul/build.gradle
new file mode 100644
index 000000000..b0f241e67
--- /dev/null
+++ b/src/ar/mangasoul/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga Soul'
+ extClass = '.MangaSoul'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://www.manga-soul.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/mangasoul/res/mipmap-hdpi/ic_launcher.png b/src/ar/mangasoul/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mangasoul/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/mangasoul/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mangasoul/res/mipmap-mdpi/ic_launcher.png b/src/ar/mangasoul/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mangasoul/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/mangasoul/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mangasoul/res/mipmap-xhdpi/ic_launcher.png b/src/ar/mangasoul/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mangasoul/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/mangasoul/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mangasoul/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/mangasoul/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mangasoul/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/mangasoul/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mangasoul/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/mangasoul/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mangasoul/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/mangasoul/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mangasoul/src/MangaSoul.kt b/src/ar/mangasoul/src/eu/kanade/tachiyomi/extension/ar/mangasoul/MangaSoul.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/mangasoul/src/MangaSoul.kt
rename to src/ar/mangasoul/src/eu/kanade/tachiyomi/extension/ar/mangasoul/MangaSoul.kt
diff --git a/src/ar/mangaspark/build.gradle b/src/ar/mangaspark/build.gradle
new file mode 100644
index 000000000..a3a55406b
--- /dev/null
+++ b/src/ar/mangaspark/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaSpark'
+ extClass = '.MangaSpark'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaspark.org'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaspark/res/mipmap-hdpi/ic_launcher.png b/src/ar/mangaspark/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaspark/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/mangaspark/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaspark/res/mipmap-mdpi/ic_launcher.png b/src/ar/mangaspark/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaspark/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/mangaspark/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaspark/res/mipmap-xhdpi/ic_launcher.png b/src/ar/mangaspark/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaspark/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/mangaspark/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaspark/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/mangaspark/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaspark/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/mangaspark/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaspark/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/mangaspark/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaspark/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/mangaspark/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaspark/src/MangaSpark.kt b/src/ar/mangaspark/src/eu/kanade/tachiyomi/extension/ar/mangaspark/MangaSpark.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaspark/src/MangaSpark.kt
rename to src/ar/mangaspark/src/eu/kanade/tachiyomi/extension/ar/mangaspark/MangaSpark.kt
diff --git a/src/ar/mangastarz/build.gradle b/src/ar/mangastarz/build.gradle
new file mode 100644
index 000000000..c7335ca62
--- /dev/null
+++ b/src/ar/mangastarz/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Starz'
+ extClass = '.MangaStarz'
+ themePkg = 'madara'
+ baseUrl = 'https://mangastarz.org'
+ overrideVersionCode = 5
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangastarz/res/mipmap-hdpi/ic_launcher.png b/src/ar/mangastarz/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangastarz/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/mangastarz/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangastarz/res/mipmap-mdpi/ic_launcher.png b/src/ar/mangastarz/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangastarz/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/mangastarz/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangastarz/res/mipmap-xhdpi/ic_launcher.png b/src/ar/mangastarz/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangastarz/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/mangastarz/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangastarz/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/mangastarz/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangastarz/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/mangastarz/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangastarz/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/mangastarz/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangastarz/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/mangastarz/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangastarz/src/MangaStarz.kt b/src/ar/mangastarz/src/eu/kanade/tachiyomi/extension/ar/mangastarz/MangaStarz.kt
similarity index 100%
rename from multisrc/overrides/madara/mangastarz/src/MangaStarz.kt
rename to src/ar/mangastarz/src/eu/kanade/tachiyomi/extension/ar/mangastarz/MangaStarz.kt
diff --git a/src/ar/mangaswat/build.gradle b/src/ar/mangaswat/build.gradle
new file mode 100644
index 000000000..74e9dc971
--- /dev/null
+++ b/src/ar/mangaswat/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaSwat'
+ extClass = '.MangaSwat'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://goldragon.me'
+ overrideVersionCode = 15
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-hdpi/ic_launcher.png b/src/ar/mangaswat/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaswat/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/mangaswat/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-mdpi/ic_launcher.png b/src/ar/mangaswat/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaswat/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/mangaswat/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xhdpi/ic_launcher.png b/src/ar/mangaswat/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/mangaswat/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/mangaswat/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/mangaswat/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/mangaswat/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/mangaswat/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaswat/src/MangaSwat.kt b/src/ar/mangaswat/src/eu/kanade/tachiyomi/extension/ar/mangaswat/MangaSwat.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaswat/src/MangaSwat.kt
rename to src/ar/mangaswat/src/eu/kanade/tachiyomi/extension/ar/mangaswat/MangaSwat.kt
diff --git a/src/ar/manhatic/build.gradle b/src/ar/manhatic/build.gradle
new file mode 100644
index 000000000..734da5bea
--- /dev/null
+++ b/src/ar/manhatic/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhatic'
+ extClass = '.Manhatic'
+ themePkg = 'madara'
+ baseUrl = 'https://manhatic.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhatic/res/mipmap-hdpi/ic_launcher.png b/src/ar/manhatic/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhatic/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/manhatic/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhatic/res/mipmap-mdpi/ic_launcher.png b/src/ar/manhatic/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhatic/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/manhatic/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhatic/res/mipmap-xhdpi/ic_launcher.png b/src/ar/manhatic/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhatic/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/manhatic/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhatic/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/manhatic/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhatic/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/manhatic/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhatic/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/manhatic/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhatic/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/manhatic/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/ar/manhatic/src/eu/kanade/tachiyomi/extension/ar/manhatic/Manhatic.kt b/src/ar/manhatic/src/eu/kanade/tachiyomi/extension/ar/manhatic/Manhatic.kt
new file mode 100644
index 000000000..383db78ab
--- /dev/null
+++ b/src/ar/manhatic/src/eu/kanade/tachiyomi/extension/ar/manhatic/Manhatic.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.ar.manhatic
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Manhatic : Madara("Manhatic", "https://manhatic.com", "ar")
diff --git a/src/ar/nijitranslations/build.gradle b/src/ar/nijitranslations/build.gradle
new file mode 100644
index 000000000..e384905e3
--- /dev/null
+++ b/src/ar/nijitranslations/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Niji Translations'
+ extClass = '.NijiTranslations'
+ themePkg = 'madara'
+ baseUrl = 'https://niji-translations.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/nijitranslations/res/mipmap-hdpi/ic_launcher.png b/src/ar/nijitranslations/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nijitranslations/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/nijitranslations/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nijitranslations/res/mipmap-mdpi/ic_launcher.png b/src/ar/nijitranslations/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nijitranslations/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/nijitranslations/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nijitranslations/res/mipmap-xhdpi/ic_launcher.png b/src/ar/nijitranslations/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nijitranslations/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/nijitranslations/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nijitranslations/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/nijitranslations/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nijitranslations/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/nijitranslations/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nijitranslations/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/nijitranslations/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nijitranslations/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/nijitranslations/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nijitranslations/src/NijiTranslations.kt b/src/ar/nijitranslations/src/eu/kanade/tachiyomi/extension/ar/nijitranslations/NijiTranslations.kt
similarity index 100%
rename from multisrc/overrides/madara/nijitranslations/src/NijiTranslations.kt
rename to src/ar/nijitranslations/src/eu/kanade/tachiyomi/extension/ar/nijitranslations/NijiTranslations.kt
diff --git a/src/ar/novelstown/build.gradle b/src/ar/novelstown/build.gradle
new file mode 100644
index 000000000..044973694
--- /dev/null
+++ b/src/ar/novelstown/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Novels Town'
+ extClass = '.NovelsTown'
+ themePkg = 'madara'
+ baseUrl = 'https://novelstown.cyou'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/ar/novelstown/src/eu/kanade/tachiyomi/extension/ar/novelstown/NovelsTown.kt b/src/ar/novelstown/src/eu/kanade/tachiyomi/extension/ar/novelstown/NovelsTown.kt
new file mode 100644
index 000000000..5f721425d
--- /dev/null
+++ b/src/ar/novelstown/src/eu/kanade/tachiyomi/extension/ar/novelstown/NovelsTown.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.ar.novelstown
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class NovelsTown : Madara("Novels Town", "https://novelstown.cyou", "ar")
diff --git a/src/ar/olaoe/build.gradle b/src/ar/olaoe/build.gradle
new file mode 100644
index 000000000..a16d59d0a
--- /dev/null
+++ b/src/ar/olaoe/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Olaoe'
+ extClass = '.Olaoe'
+ themePkg = 'madara'
+ baseUrl = 'https://olaoe.cyou'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/olaoe/res/mipmap-hdpi/ic_launcher.png b/src/ar/olaoe/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/olaoe/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/olaoe/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/olaoe/res/mipmap-mdpi/ic_launcher.png b/src/ar/olaoe/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/olaoe/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/olaoe/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/olaoe/res/mipmap-xhdpi/ic_launcher.png b/src/ar/olaoe/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/olaoe/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/olaoe/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/olaoe/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/olaoe/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/olaoe/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/olaoe/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/olaoe/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/olaoe/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/olaoe/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/olaoe/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/olaoe/src/Olaoe.kt b/src/ar/olaoe/src/eu/kanade/tachiyomi/extension/ar/olaoe/Olaoe.kt
similarity index 100%
rename from multisrc/overrides/madara/olaoe/src/Olaoe.kt
rename to src/ar/olaoe/src/eu/kanade/tachiyomi/extension/ar/olaoe/Olaoe.kt
diff --git a/src/ar/onma/build.gradle b/src/ar/onma/build.gradle
new file mode 100644
index 000000000..dd9b476b1
--- /dev/null
+++ b/src/ar/onma/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Onma'
+ extClass = '.Onma'
+ themePkg = 'mmrcms'
+ baseUrl = 'https://onma.top'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mmrcms/onma/res/mipmap-hdpi/ic_launcher.png b/src/ar/onma/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/onma/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/onma/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/onma/res/mipmap-mdpi/ic_launcher.png b/src/ar/onma/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/onma/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/onma/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/onma/res/mipmap-xhdpi/ic_launcher.png b/src/ar/onma/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/onma/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/onma/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/onma/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/onma/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/onma/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/onma/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/onma/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/onma/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/onma/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/onma/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/onma/src/Onma.kt b/src/ar/onma/src/eu/kanade/tachiyomi/extension/ar/onma/Onma.kt
similarity index 100%
rename from multisrc/overrides/mmrcms/onma/src/Onma.kt
rename to src/ar/onma/src/eu/kanade/tachiyomi/extension/ar/onma/Onma.kt
diff --git a/src/ar/ozulscans/build.gradle b/src/ar/ozulscans/build.gradle
new file mode 100644
index 000000000..3c445754f
--- /dev/null
+++ b/src/ar/ozulscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Ozul Scans'
+ extClass = '.OzulScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://kingofmanga.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/ozulscans/res/mipmap-hdpi/ic_launcher.png b/src/ar/ozulscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ozulscans/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/ozulscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ozulscans/res/mipmap-mdpi/ic_launcher.png b/src/ar/ozulscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ozulscans/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/ozulscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ozulscans/res/mipmap-xhdpi/ic_launcher.png b/src/ar/ozulscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ozulscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/ozulscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ozulscans/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/ozulscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ozulscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/ozulscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ozulscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/ozulscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ozulscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/ozulscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ozulscans/src/OzulScans.kt b/src/ar/ozulscans/src/eu/kanade/tachiyomi/extension/ar/ozulscans/OzulScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/ozulscans/src/OzulScans.kt
rename to src/ar/ozulscans/src/eu/kanade/tachiyomi/extension/ar/ozulscans/OzulScans.kt
diff --git a/src/ar/potatomanga/build.gradle b/src/ar/potatomanga/build.gradle
new file mode 100644
index 000000000..20dd590ad
--- /dev/null
+++ b/src/ar/potatomanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'PotatoManga'
+ extClass = '.PotatoManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://potatomanga.xyz'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/potatomanga/res/mipmap-hdpi/ic_launcher.png b/src/ar/potatomanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/potatomanga/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/potatomanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/potatomanga/res/mipmap-mdpi/ic_launcher.png b/src/ar/potatomanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/potatomanga/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/potatomanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/potatomanga/res/mipmap-xhdpi/ic_launcher.png b/src/ar/potatomanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/potatomanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/potatomanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/potatomanga/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/potatomanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/potatomanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/potatomanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/potatomanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/potatomanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/potatomanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/potatomanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/potatomanga/src/PotatoManga.kt b/src/ar/potatomanga/src/eu/kanade/tachiyomi/extension/ar/potatomanga/PotatoManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/potatomanga/src/PotatoManga.kt
rename to src/ar/potatomanga/src/eu/kanade/tachiyomi/extension/ar/potatomanga/PotatoManga.kt
diff --git a/src/ar/vexmanga/build.gradle b/src/ar/vexmanga/build.gradle
new file mode 100644
index 000000000..f0653190b
--- /dev/null
+++ b/src/ar/vexmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Vex Manga'
+ extClass = '.VexManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://vexmanga.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/vexmanga/res/mipmap-hdpi/ic_launcher.png b/src/ar/vexmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/vexmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/vexmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/vexmanga/res/mipmap-mdpi/ic_launcher.png b/src/ar/vexmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/vexmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/vexmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/vexmanga/res/mipmap-xhdpi/ic_launcher.png b/src/ar/vexmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/vexmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/vexmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/vexmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/vexmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/vexmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/vexmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/vexmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/vexmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/vexmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/vexmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/vexmanga/src/VexManga.kt b/src/ar/vexmanga/src/eu/kanade/tachiyomi/extension/ar/vexmanga/VexManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/vexmanga/src/VexManga.kt
rename to src/ar/vexmanga/src/eu/kanade/tachiyomi/extension/ar/vexmanga/VexManga.kt
diff --git a/src/ar/yokai/build.gradle b/src/ar/yokai/build.gradle
new file mode 100644
index 000000000..11f0cb883
--- /dev/null
+++ b/src/ar/yokai/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Yokai'
+ extClass = '.Yokai'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://yokai-team.blogspot.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/yokai/res/mipmap-hdpi/ic_launcher.png b/src/ar/yokai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/yokai/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/yokai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/yokai/res/mipmap-mdpi/ic_launcher.png b/src/ar/yokai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/yokai/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/yokai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/yokai/res/mipmap-xhdpi/ic_launcher.png b/src/ar/yokai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/yokai/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/yokai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/yokai/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/yokai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/yokai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/yokai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/yokai/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/yokai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/yokai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/yokai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/yokai/src/Yokai.kt b/src/ar/yokai/src/eu/kanade/tachiyomi/extension/ar/yokai/Yokai.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/yokai/src/Yokai.kt
rename to src/ar/yokai/src/eu/kanade/tachiyomi/extension/ar/yokai/Yokai.kt
diff --git a/src/ar/yonabar/build.gradle b/src/ar/yonabar/build.gradle
new file mode 100644
index 000000000..1bb0e6d5e
--- /dev/null
+++ b/src/ar/yonabar/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'YonaBar'
+ extClass = '.YonaBar'
+ themePkg = 'madara'
+ baseUrl = 'https://yonabar.com'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/yonabar/res/mipmap-hdpi/ic_launcher.png b/src/ar/yonabar/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yonabar/res/mipmap-hdpi/ic_launcher.png
rename to src/ar/yonabar/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yonabar/res/mipmap-mdpi/ic_launcher.png b/src/ar/yonabar/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yonabar/res/mipmap-mdpi/ic_launcher.png
rename to src/ar/yonabar/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yonabar/res/mipmap-xhdpi/ic_launcher.png b/src/ar/yonabar/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yonabar/res/mipmap-xhdpi/ic_launcher.png
rename to src/ar/yonabar/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yonabar/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/yonabar/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yonabar/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ar/yonabar/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yonabar/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/yonabar/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yonabar/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ar/yonabar/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yonabar/src/YonaBar.kt b/src/ar/yonabar/src/eu/kanade/tachiyomi/extension/ar/yonabar/YonaBar.kt
similarity index 100%
rename from multisrc/overrides/madara/yonabar/src/YonaBar.kt
rename to src/ar/yonabar/src/eu/kanade/tachiyomi/extension/ar/yonabar/YonaBar.kt
diff --git a/src/bg/utsukushii/build.gradle b/src/bg/utsukushii/build.gradle
new file mode 100644
index 000000000..07a4938d9
--- /dev/null
+++ b/src/bg/utsukushii/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Utsukushii'
+ extClass = '.Utsukushii'
+ themePkg = 'mmrcms'
+ baseUrl = 'https://utsukushii-bg.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mmrcms/utsukushii/res/mipmap-hdpi/ic_launcher.png b/src/bg/utsukushii/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/utsukushii/res/mipmap-hdpi/ic_launcher.png
rename to src/bg/utsukushii/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/utsukushii/res/mipmap-mdpi/ic_launcher.png b/src/bg/utsukushii/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/utsukushii/res/mipmap-mdpi/ic_launcher.png
rename to src/bg/utsukushii/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/utsukushii/res/mipmap-xhdpi/ic_launcher.png b/src/bg/utsukushii/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/utsukushii/res/mipmap-xhdpi/ic_launcher.png
rename to src/bg/utsukushii/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/utsukushii/res/mipmap-xxhdpi/ic_launcher.png b/src/bg/utsukushii/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/utsukushii/res/mipmap-xxhdpi/ic_launcher.png
rename to src/bg/utsukushii/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/utsukushii/res/mipmap-xxxhdpi/ic_launcher.png b/src/bg/utsukushii/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/utsukushii/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/bg/utsukushii/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/utsukushii/src/Utsukushii.kt b/src/bg/utsukushii/src/eu/kanade/tachiyomi/extension/bg/utsukushii/Utsukushii.kt
similarity index 100%
rename from multisrc/overrides/mmrcms/utsukushii/src/Utsukushii.kt
rename to src/bg/utsukushii/src/eu/kanade/tachiyomi/extension/bg/utsukushii/Utsukushii.kt
diff --git a/src/ca/fansubscat/build.gradle b/src/ca/fansubscat/build.gradle
new file mode 100644
index 000000000..b6089197e
--- /dev/null
+++ b/src/ca/fansubscat/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Fansubs.cat'
+ extClass = '.FansubsCatMain'
+ themePkg = 'fansubscat'
+ baseUrl = 'https://manga.fansubs.cat'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/fansubscat/fansubscat/res/mipmap-hdpi/ic_launcher.png b/src/ca/fansubscat/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fansubscat/fansubscat/res/mipmap-hdpi/ic_launcher.png
rename to src/ca/fansubscat/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/fansubscat/fansubscat/res/mipmap-mdpi/ic_launcher.png b/src/ca/fansubscat/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fansubscat/fansubscat/res/mipmap-mdpi/ic_launcher.png
rename to src/ca/fansubscat/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/fansubscat/fansubscat/res/mipmap-xhdpi/ic_launcher.png b/src/ca/fansubscat/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fansubscat/fansubscat/res/mipmap-xhdpi/ic_launcher.png
rename to src/ca/fansubscat/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fansubscat/fansubscat/res/mipmap-xxhdpi/ic_launcher.png b/src/ca/fansubscat/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fansubscat/fansubscat/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ca/fansubscat/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fansubscat/fansubscat/res/mipmap-xxxhdpi/ic_launcher.png b/src/ca/fansubscat/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fansubscat/fansubscat/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ca/fansubscat/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fansubscat/fansubscat/src/FansubsCatMain.kt b/src/ca/fansubscat/src/eu/kanade/tachiyomi/extension/ca/fansubscat/FansubsCatMain.kt
similarity index 100%
rename from multisrc/overrides/fansubscat/fansubscat/src/FansubsCatMain.kt
rename to src/ca/fansubscat/src/eu/kanade/tachiyomi/extension/ca/fansubscat/FansubsCatMain.kt
diff --git a/src/ca/fansubscathentai/build.gradle b/src/ca/fansubscathentai/build.gradle
new file mode 100644
index 000000000..ee61e08f0
--- /dev/null
+++ b/src/ca/fansubscathentai/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Fansubs.cat - Hentai'
+ extClass = '.FansubsCatHentai'
+ themePkg = 'fansubscat'
+ baseUrl = 'https://hentai.fansubs.cat/manga'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/fansubscat/fansubscathentai/res/mipmap-hdpi/ic_launcher.png b/src/ca/fansubscathentai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fansubscat/fansubscathentai/res/mipmap-hdpi/ic_launcher.png
rename to src/ca/fansubscathentai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/fansubscat/fansubscathentai/res/mipmap-mdpi/ic_launcher.png b/src/ca/fansubscathentai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fansubscat/fansubscathentai/res/mipmap-mdpi/ic_launcher.png
rename to src/ca/fansubscathentai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/fansubscat/fansubscathentai/res/mipmap-xhdpi/ic_launcher.png b/src/ca/fansubscathentai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fansubscat/fansubscathentai/res/mipmap-xhdpi/ic_launcher.png
rename to src/ca/fansubscathentai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fansubscat/fansubscathentai/res/mipmap-xxhdpi/ic_launcher.png b/src/ca/fansubscathentai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fansubscat/fansubscathentai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ca/fansubscathentai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fansubscat/fansubscathentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/ca/fansubscathentai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fansubscat/fansubscathentai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ca/fansubscathentai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fansubscat/fansubscathentai/src/FansubsCatHentai.kt b/src/ca/fansubscathentai/src/eu/kanade/tachiyomi/extension/ca/fansubscathentai/FansubsCatHentai.kt
similarity index 100%
rename from multisrc/overrides/fansubscat/fansubscathentai/src/FansubsCatHentai.kt
rename to src/ca/fansubscathentai/src/eu/kanade/tachiyomi/extension/ca/fansubscathentai/FansubsCatHentai.kt
diff --git a/src/cs/evilproduction/build.gradle b/src/cs/evilproduction/build.gradle
new file mode 100644
index 000000000..cad39a813
--- /dev/null
+++ b/src/cs/evilproduction/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Evil production'
+ extClass = '.Evilproduction'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://evil-manga.eu'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/evilproduction/res/mipmap-hdpi/ic_launcher.png b/src/cs/evilproduction/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/evilproduction/res/mipmap-hdpi/ic_launcher.png
rename to src/cs/evilproduction/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/evilproduction/res/mipmap-mdpi/ic_launcher.png b/src/cs/evilproduction/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/evilproduction/res/mipmap-mdpi/ic_launcher.png
rename to src/cs/evilproduction/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/evilproduction/res/mipmap-xhdpi/ic_launcher.png b/src/cs/evilproduction/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/evilproduction/res/mipmap-xhdpi/ic_launcher.png
rename to src/cs/evilproduction/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/evilproduction/res/mipmap-xxhdpi/ic_launcher.png b/src/cs/evilproduction/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/evilproduction/res/mipmap-xxhdpi/ic_launcher.png
rename to src/cs/evilproduction/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/evilproduction/res/mipmap-xxxhdpi/ic_launcher.png b/src/cs/evilproduction/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/evilproduction/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/cs/evilproduction/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/cs/evilproduction/src/eu/kanade/tachiyomi/extension/cs/evilproduction/Evilproduction.kt b/src/cs/evilproduction/src/eu/kanade/tachiyomi/extension/cs/evilproduction/Evilproduction.kt
new file mode 100644
index 000000000..e1b2309c9
--- /dev/null
+++ b/src/cs/evilproduction/src/eu/kanade/tachiyomi/extension/cs/evilproduction/Evilproduction.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.cs.evilproduction
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class Evilproduction : MangaThemesia("Evil production", "https://evil-manga.eu", "cs")
diff --git a/src/en/adultwebtoon/build.gradle b/src/en/adultwebtoon/build.gradle
new file mode 100644
index 000000000..96e41ce9d
--- /dev/null
+++ b/src/en/adultwebtoon/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Adult Webtoon'
+ extClass = '.AdultWebtoon'
+ themePkg = 'madara'
+ baseUrl = 'https://adultwebtoon.com'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/adultwebtoon/res/mipmap-hdpi/ic_launcher.png b/src/en/adultwebtoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/adultwebtoon/res/mipmap-hdpi/ic_launcher.png
rename to src/en/adultwebtoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/adultwebtoon/res/mipmap-mdpi/ic_launcher.png b/src/en/adultwebtoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/adultwebtoon/res/mipmap-mdpi/ic_launcher.png
rename to src/en/adultwebtoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/adultwebtoon/res/mipmap-xhdpi/ic_launcher.png b/src/en/adultwebtoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/adultwebtoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/adultwebtoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/adultwebtoon/res/mipmap-xxhdpi/ic_launcher.png b/src/en/adultwebtoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/adultwebtoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/adultwebtoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/adultwebtoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/adultwebtoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/adultwebtoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/adultwebtoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/adultwebtoon/src/AdultWebtoon.kt b/src/en/adultwebtoon/src/eu/kanade/tachiyomi/extension/en/adultwebtoon/AdultWebtoon.kt
similarity index 100%
rename from multisrc/overrides/madara/adultwebtoon/src/AdultWebtoon.kt
rename to src/en/adultwebtoon/src/eu/kanade/tachiyomi/extension/en/adultwebtoon/AdultWebtoon.kt
diff --git a/src/en/allporncomic/build.gradle b/src/en/allporncomic/build.gradle
new file mode 100644
index 000000000..19dec44ce
--- /dev/null
+++ b/src/en/allporncomic/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'AllPornComic'
+ extClass = '.AllPornComic'
+ themePkg = 'madara'
+ baseUrl = 'https://allporncomic.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/allporncomic/res/mipmap-hdpi/ic_launcher.png b/src/en/allporncomic/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/allporncomic/res/mipmap-hdpi/ic_launcher.png
rename to src/en/allporncomic/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/allporncomic/res/mipmap-mdpi/ic_launcher.png b/src/en/allporncomic/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/allporncomic/res/mipmap-mdpi/ic_launcher.png
rename to src/en/allporncomic/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/allporncomic/res/mipmap-xhdpi/ic_launcher.png b/src/en/allporncomic/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/allporncomic/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/allporncomic/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/allporncomic/res/mipmap-xxhdpi/ic_launcher.png b/src/en/allporncomic/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/allporncomic/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/allporncomic/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/allporncomic/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/allporncomic/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/allporncomic/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/allporncomic/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/allporncomic/src/AllPornComic.kt b/src/en/allporncomic/src/eu/kanade/tachiyomi/extension/en/allporncomic/AllPornComic.kt
similarity index 100%
rename from multisrc/overrides/madara/allporncomic/src/AllPornComic.kt
rename to src/en/allporncomic/src/eu/kanade/tachiyomi/extension/en/allporncomic/AllPornComic.kt
diff --git a/src/en/anatanomotokare/build.gradle b/src/en/anatanomotokare/build.gradle
new file mode 100644
index 000000000..6f09307a9
--- /dev/null
+++ b/src/en/anatanomotokare/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Anata no Motokare'
+ extClass = '.AnataNoMotokare'
+ themePkg = 'foolslide'
+ baseUrl = 'https://motokare.xyz'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/foolslide/anatanomotokare/res/mipmap-hdpi/ic_launcher.png b/src/en/anatanomotokare/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/anatanomotokare/res/mipmap-hdpi/ic_launcher.png
rename to src/en/anatanomotokare/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/anatanomotokare/res/mipmap-mdpi/ic_launcher.png b/src/en/anatanomotokare/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/anatanomotokare/res/mipmap-mdpi/ic_launcher.png
rename to src/en/anatanomotokare/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/anatanomotokare/res/mipmap-xhdpi/ic_launcher.png b/src/en/anatanomotokare/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/anatanomotokare/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/anatanomotokare/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/anatanomotokare/res/mipmap-xxhdpi/ic_launcher.png b/src/en/anatanomotokare/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/anatanomotokare/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/anatanomotokare/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/anatanomotokare/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/anatanomotokare/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/anatanomotokare/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/anatanomotokare/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/anatanomotokare/src/AnataNoMotokare.kt b/src/en/anatanomotokare/src/eu/kanade/tachiyomi/extension/en/anatanomotokare/AnataNoMotokare.kt
similarity index 100%
rename from multisrc/overrides/foolslide/anatanomotokare/src/AnataNoMotokare.kt
rename to src/en/anatanomotokare/src/eu/kanade/tachiyomi/extension/en/anatanomotokare/AnataNoMotokare.kt
diff --git a/src/en/animatedglitchedcomics/build.gradle b/src/en/animatedglitchedcomics/build.gradle
new file mode 100644
index 000000000..f43813656
--- /dev/null
+++ b/src/en/animatedglitchedcomics/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Animated Glitched Comics'
+ extClass = '.AnimatedGlitchedComics'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://agscomics.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/animatedglitchedcomics/res/mipmap-hdpi/ic_launcher.png b/src/en/animatedglitchedcomics/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/animatedglitchedcomics/res/mipmap-hdpi/ic_launcher.png
rename to src/en/animatedglitchedcomics/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/animatedglitchedcomics/res/mipmap-mdpi/ic_launcher.png b/src/en/animatedglitchedcomics/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/animatedglitchedcomics/res/mipmap-mdpi/ic_launcher.png
rename to src/en/animatedglitchedcomics/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/animatedglitchedcomics/res/mipmap-xhdpi/ic_launcher.png b/src/en/animatedglitchedcomics/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/animatedglitchedcomics/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/animatedglitchedcomics/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/animatedglitchedcomics/res/mipmap-xxhdpi/ic_launcher.png b/src/en/animatedglitchedcomics/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/animatedglitchedcomics/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/animatedglitchedcomics/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/animatedglitchedcomics/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/animatedglitchedcomics/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/animatedglitchedcomics/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/animatedglitchedcomics/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/animatedglitchedcomics/src/AnimatedGlitchedComics.kt b/src/en/animatedglitchedcomics/src/eu/kanade/tachiyomi/extension/en/animatedglitchedcomics/AnimatedGlitchedComics.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/animatedglitchedcomics/src/AnimatedGlitchedComics.kt
rename to src/en/animatedglitchedcomics/src/eu/kanade/tachiyomi/extension/en/animatedglitchedcomics/AnimatedGlitchedComics.kt
diff --git a/src/en/animatedglitchedscans/build.gradle b/src/en/animatedglitchedscans/build.gradle
new file mode 100644
index 000000000..e4a62ef43
--- /dev/null
+++ b/src/en/animatedglitchedscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Animated Glitched Scans'
+ extClass = '.AnimatedGlitchedScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://anigliscans.xyz'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/animatedglitchedscans/res/mipmap-hdpi/ic_launcher.png b/src/en/animatedglitchedscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/animatedglitchedscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/animatedglitchedscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/animatedglitchedscans/res/mipmap-mdpi/ic_launcher.png b/src/en/animatedglitchedscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/animatedglitchedscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/animatedglitchedscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/animatedglitchedscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/animatedglitchedscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/animatedglitchedscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/animatedglitchedscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/animatedglitchedscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/animatedglitchedscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/animatedglitchedscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/animatedglitchedscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/animatedglitchedscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/animatedglitchedscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/animatedglitchedscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/animatedglitchedscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/animatedglitchedscans/src/AnimatedGlitchedScans.kt b/src/en/animatedglitchedscans/src/eu/kanade/tachiyomi/extension/en/animatedglitchedscans/AnimatedGlitchedScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/animatedglitchedscans/src/AnimatedGlitchedScans.kt
rename to src/en/animatedglitchedscans/src/eu/kanade/tachiyomi/extension/en/animatedglitchedscans/AnimatedGlitchedScans.kt
diff --git a/src/en/anshscans/build.gradle b/src/en/anshscans/build.gradle
new file mode 100644
index 000000000..f8211448f
--- /dev/null
+++ b/src/en/anshscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Ansh Scans'
+ extClass = '.AnshScans'
+ themePkg = 'madara'
+ baseUrl = 'https://anshscans.org'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/anshscans/res/mipmap-hdpi/ic_launcher.png b/src/en/anshscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anshscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/anshscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anshscans/res/mipmap-mdpi/ic_launcher.png b/src/en/anshscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anshscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/anshscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anshscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/anshscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anshscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/anshscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anshscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/anshscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anshscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/anshscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anshscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/anshscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anshscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/anshscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anshscans/src/AnshScans.kt b/src/en/anshscans/src/eu/kanade/tachiyomi/extension/en/anshscans/AnshScans.kt
similarity index 100%
rename from multisrc/overrides/madara/anshscans/src/AnshScans.kt
rename to src/en/anshscans/src/eu/kanade/tachiyomi/extension/en/anshscans/AnshScans.kt
diff --git a/src/en/apairof2/build.gradle b/src/en/apairof2/build.gradle
new file mode 100644
index 000000000..caae4a711
--- /dev/null
+++ b/src/en/apairof2/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'A Pair Of 2+'
+ extClass = '.APairOf2'
+ themePkg = 'po2scans'
+ baseUrl = 'https://po2scans.com'
+ overrideVersionCode = 31
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/po2scans/apairof2/res/mipmap-hdpi/ic_launcher.png b/src/en/apairof2/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/po2scans/apairof2/res/mipmap-hdpi/ic_launcher.png
rename to src/en/apairof2/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/po2scans/apairof2/res/mipmap-mdpi/ic_launcher.png b/src/en/apairof2/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/po2scans/apairof2/res/mipmap-mdpi/ic_launcher.png
rename to src/en/apairof2/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/po2scans/apairof2/res/mipmap-xhdpi/ic_launcher.png b/src/en/apairof2/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/po2scans/apairof2/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/apairof2/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/po2scans/apairof2/res/mipmap-xxhdpi/ic_launcher.png b/src/en/apairof2/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/po2scans/apairof2/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/apairof2/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/po2scans/apairof2/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/apairof2/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/po2scans/apairof2/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/apairof2/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/po2scans/apairof2/src/APairOf2.kt b/src/en/apairof2/src/eu/kanade/tachiyomi/extension/en/apairof2/APairOf2.kt
similarity index 100%
rename from multisrc/overrides/po2scans/apairof2/src/APairOf2.kt
rename to src/en/apairof2/src/eu/kanade/tachiyomi/extension/en/apairof2/APairOf2.kt
diff --git a/src/en/aquamanga/build.gradle b/src/en/aquamanga/build.gradle
new file mode 100644
index 000000000..64656c781
--- /dev/null
+++ b/src/en/aquamanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Aqua Manga'
+ extClass = '.AquaManga'
+ themePkg = 'madara'
+ baseUrl = 'https://aquamanga.org'
+ overrideVersionCode = 8
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/aquamanga/res/mipmap-hdpi/ic_launcher.png b/src/en/aquamanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/aquamanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/aquamanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/aquamanga/res/mipmap-mdpi/ic_launcher.png b/src/en/aquamanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/aquamanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/aquamanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/aquamanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/aquamanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/aquamanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/aquamanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/aquamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/aquamanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/aquamanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/aquamanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/aquamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/aquamanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/aquamanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/aquamanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/aquamanga/src/AquaManga.kt b/src/en/aquamanga/src/eu/kanade/tachiyomi/extension/en/aquamanga/AquaManga.kt
similarity index 100%
rename from multisrc/overrides/madara/aquamanga/src/AquaManga.kt
rename to src/en/aquamanga/src/eu/kanade/tachiyomi/extension/en/aquamanga/AquaManga.kt
diff --git a/src/en/arcanescans/build.gradle b/src/en/arcanescans/build.gradle
new file mode 100644
index 000000000..344145941
--- /dev/null
+++ b/src/en/arcanescans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Arcanescans'
+ extClass = '.Arcanescans'
+ themePkg = 'madara'
+ baseUrl = 'https://arcanescans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/arcanescans/res/mipmap-hdpi/ic_launcher.png b/src/en/arcanescans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arcanescans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/arcanescans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arcanescans/res/mipmap-mdpi/ic_launcher.png b/src/en/arcanescans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arcanescans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/arcanescans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arcanescans/res/mipmap-xhdpi/ic_launcher.png b/src/en/arcanescans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arcanescans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/arcanescans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arcanescans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/arcanescans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arcanescans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/arcanescans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arcanescans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/arcanescans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arcanescans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/arcanescans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/arcanescans/src/eu/kanade/tachiyomi/extension/en/arcanescans/Arcanescans.kt b/src/en/arcanescans/src/eu/kanade/tachiyomi/extension/en/arcanescans/Arcanescans.kt
new file mode 100644
index 000000000..d0d14a20f
--- /dev/null
+++ b/src/en/arcanescans/src/eu/kanade/tachiyomi/extension/en/arcanescans/Arcanescans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.arcanescans
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Arcanescans : Madara("Arcanescans", "https://arcanescans.com", "en")
diff --git a/src/en/arcrelight/build.gradle b/src/en/arcrelight/build.gradle
new file mode 100644
index 000000000..fa47d345c
--- /dev/null
+++ b/src/en/arcrelight/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Arc-Relight'
+ extClass = '.ArcRelight'
+ themePkg = 'mangadventure'
+ baseUrl = 'https://arc-relight.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangadventure/arcrelight/res/mipmap-hdpi/ic_launcher.png b/src/en/arcrelight/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/arcrelight/res/mipmap-hdpi/ic_launcher.png
rename to src/en/arcrelight/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/arcrelight/res/mipmap-mdpi/ic_launcher.png b/src/en/arcrelight/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/arcrelight/res/mipmap-mdpi/ic_launcher.png
rename to src/en/arcrelight/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/arcrelight/res/mipmap-xhdpi/ic_launcher.png b/src/en/arcrelight/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/arcrelight/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/arcrelight/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/arcrelight/res/mipmap-xxhdpi/ic_launcher.png b/src/en/arcrelight/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/arcrelight/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/arcrelight/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/arcrelight/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/arcrelight/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/arcrelight/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/arcrelight/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/arcrelight/src/ArcRelight.kt b/src/en/arcrelight/src/eu/kanade/tachiyomi/extension/en/arcrelight/ArcRelight.kt
similarity index 100%
rename from multisrc/overrides/mangadventure/arcrelight/src/ArcRelight.kt
rename to src/en/arcrelight/src/eu/kanade/tachiyomi/extension/en/arcrelight/ArcRelight.kt
diff --git a/src/en/arvenscans/build.gradle b/src/en/arvenscans/build.gradle
new file mode 100644
index 000000000..98d02e4d0
--- /dev/null
+++ b/src/en/arvenscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Arven Scans'
+ extClass = '.ArvenScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://arvenscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/arvenscans/res/mipmap-hdpi/ic_launcher.png b/src/en/arvenscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/arvenscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/arvenscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/arvenscans/res/mipmap-mdpi/ic_launcher.png b/src/en/arvenscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/arvenscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/arvenscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/arvenscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/arvenscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/arvenscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/arvenscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/arvenscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/arvenscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/arvenscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/arvenscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/arvenscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/arvenscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/arvenscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/arvenscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/arvenscans/src/ArvenScans.kt b/src/en/arvenscans/src/eu/kanade/tachiyomi/extension/en/arvenscans/ArvenScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/arvenscans/src/ArvenScans.kt
rename to src/en/arvenscans/src/eu/kanade/tachiyomi/extension/en/arvenscans/ArvenScans.kt
diff --git a/src/en/ascalonscans/build.gradle b/src/en/ascalonscans/build.gradle
new file mode 100644
index 000000000..b7d81662b
--- /dev/null
+++ b/src/en/ascalonscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'AscalonScans'
+ extClass = '.AscalonScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://ascalonscans.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/ascalonscans/res/mipmap-hdpi/ic_launcher.png b/src/en/ascalonscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ascalonscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/ascalonscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ascalonscans/res/mipmap-mdpi/ic_launcher.png b/src/en/ascalonscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ascalonscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/ascalonscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ascalonscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/ascalonscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ascalonscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/ascalonscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ascalonscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/ascalonscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ascalonscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/ascalonscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ascalonscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/ascalonscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ascalonscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/ascalonscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ascalonscans/src/AscalonScans.kt b/src/en/ascalonscans/src/eu/kanade/tachiyomi/extension/en/ascalonscans/AscalonScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/ascalonscans/src/AscalonScans.kt
rename to src/en/ascalonscans/src/eu/kanade/tachiyomi/extension/en/ascalonscans/AscalonScans.kt
diff --git a/src/en/assortedscans/build.gradle b/src/en/assortedscans/build.gradle
new file mode 100644
index 000000000..54a748e40
--- /dev/null
+++ b/src/en/assortedscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Assorted Scans'
+ extClass = '.AssortedScans'
+ themePkg = 'mangadventure'
+ baseUrl = 'https://assortedscans.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangadventure/assortedscans/res/mipmap-hdpi/ic_launcher.png b/src/en/assortedscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/assortedscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/assortedscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/assortedscans/res/mipmap-mdpi/ic_launcher.png b/src/en/assortedscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/assortedscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/assortedscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/assortedscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/assortedscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/assortedscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/assortedscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/assortedscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/assortedscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/assortedscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/assortedscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangadventure/assortedscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/assortedscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangadventure/assortedscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/assortedscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/assortedscans/src/eu/kanade/tachiyomi/extension/en/assortedscans/AssortedScans.kt b/src/en/assortedscans/src/eu/kanade/tachiyomi/extension/en/assortedscans/AssortedScans.kt
new file mode 100644
index 000000000..79d2d585f
--- /dev/null
+++ b/src/en/assortedscans/src/eu/kanade/tachiyomi/extension/en/assortedscans/AssortedScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.assortedscans
+
+import eu.kanade.tachiyomi.multisrc.mangadventure.MangAdventure
+
+class AssortedScans : MangAdventure("Assorted Scans", "https://assortedscans.com", "en")
diff --git a/src/en/asurascans/build.gradle b/src/en/asurascans/build.gradle
new file mode 100644
index 000000000..f283968d2
--- /dev/null
+++ b/src/en/asurascans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Asura Scans'
+ extClass = '.AsuraScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://asuratoon.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/asurascansus/res/mipmap-hdpi/ic_launcher.png b/src/en/asurascans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/asurascansus/res/mipmap-hdpi/ic_launcher.png
rename to src/en/asurascans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/asurascansus/res/mipmap-mdpi/ic_launcher.png b/src/en/asurascans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/asurascansus/res/mipmap-mdpi/ic_launcher.png
rename to src/en/asurascans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/asurascansus/res/mipmap-xhdpi/ic_launcher.png b/src/en/asurascans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/asurascansus/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/asurascans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/asurascansus/res/mipmap-xxhdpi/ic_launcher.png b/src/en/asurascans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/asurascansus/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/asurascans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/asurascansus/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/asurascans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/asurascansus/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/asurascans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/asurascans/src/AsuraScans.kt b/src/en/asurascans/src/eu/kanade/tachiyomi/extension/en/asurascans/AsuraScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/asurascans/src/AsuraScans.kt
rename to src/en/asurascans/src/eu/kanade/tachiyomi/extension/en/asurascans/AsuraScans.kt
diff --git a/src/en/asurascansus/build.gradle b/src/en/asurascansus/build.gradle
new file mode 100644
index 000000000..9bc733198
--- /dev/null
+++ b/src/en/asurascansus/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Asura Scans.us (unoriginal)'
+ extClass = '.AsuraScansUs'
+ themePkg = 'madara'
+ baseUrl = 'https://asurascans.us'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/asurascans/res/mipmap-hdpi/ic_launcher.png b/src/en/asurascansus/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/asurascans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/asurascansus/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/asurascans/res/mipmap-mdpi/ic_launcher.png b/src/en/asurascansus/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/asurascans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/asurascansus/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/asurascans/res/mipmap-xhdpi/ic_launcher.png b/src/en/asurascansus/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/asurascans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/asurascansus/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/asurascans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/asurascansus/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/asurascans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/asurascansus/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/asurascans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/asurascansus/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/asurascans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/asurascansus/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/asurascansus/src/AsuraScansUs.kt b/src/en/asurascansus/src/eu/kanade/tachiyomi/extension/en/asurascansus/AsuraScansUs.kt
similarity index 100%
rename from multisrc/overrides/madara/asurascansus/src/AsuraScansUs.kt
rename to src/en/asurascansus/src/eu/kanade/tachiyomi/extension/en/asurascansus/AsuraScansUs.kt
diff --git a/src/en/babelwuxia/build.gradle b/src/en/babelwuxia/build.gradle
new file mode 100644
index 000000000..edd1de284
--- /dev/null
+++ b/src/en/babelwuxia/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Babel Wuxia'
+ extClass = '.BabelWuxia'
+ themePkg = 'madara'
+ baseUrl = 'https://babelwuxia.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/babelwuxia/res/mipmap-hdpi/ic_launcher.png b/src/en/babelwuxia/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/babelwuxia/res/mipmap-hdpi/ic_launcher.png
rename to src/en/babelwuxia/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/babelwuxia/res/mipmap-mdpi/ic_launcher.png b/src/en/babelwuxia/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/babelwuxia/res/mipmap-mdpi/ic_launcher.png
rename to src/en/babelwuxia/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/babelwuxia/res/mipmap-xhdpi/ic_launcher.png b/src/en/babelwuxia/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/babelwuxia/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/babelwuxia/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/babelwuxia/res/mipmap-xxhdpi/ic_launcher.png b/src/en/babelwuxia/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/babelwuxia/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/babelwuxia/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/babelwuxia/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/babelwuxia/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/babelwuxia/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/babelwuxia/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/babelwuxia/src/BabelWuxia.kt b/src/en/babelwuxia/src/eu/kanade/tachiyomi/extension/en/babelwuxia/BabelWuxia.kt
similarity index 100%
rename from multisrc/overrides/madara/babelwuxia/src/BabelWuxia.kt
rename to src/en/babelwuxia/src/eu/kanade/tachiyomi/extension/en/babelwuxia/BabelWuxia.kt
diff --git a/src/en/bakkin/build.gradle b/src/en/bakkin/build.gradle
new file mode 100644
index 000000000..3ee850f71
--- /dev/null
+++ b/src/en/bakkin/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Bakkin'
+ extClass = '.Bakkin'
+ themePkg = 'bakkin'
+ baseUrl = 'https://bakkin.moe/reader/'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/bakkin/src/eu/kanade/tachiyomi/extension/en/bakkin/Bakkin.kt b/src/en/bakkin/src/eu/kanade/tachiyomi/extension/en/bakkin/Bakkin.kt
new file mode 100644
index 000000000..385633b31
--- /dev/null
+++ b/src/en/bakkin/src/eu/kanade/tachiyomi/extension/en/bakkin/Bakkin.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.bakkin
+
+import eu.kanade.tachiyomi.multisrc.bakkin.BakkinReaderX
+
+class Bakkin : BakkinReaderX("Bakkin", "https://bakkin.moe/reader/", "en")
diff --git a/src/en/bakkinselfhosted/build.gradle b/src/en/bakkinselfhosted/build.gradle
new file mode 100644
index 000000000..e1d087629
--- /dev/null
+++ b/src/en/bakkinselfhosted/build.gradle
@@ -0,0 +1,8 @@
+ext {
+ extName = 'Bakkin Self-hosted'
+ extClass = '.BakkinSelfHosted'
+ themePkg = 'bakkin'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/bakkin/bakkinselfhosted/src/BakkinSelfHosted.kt b/src/en/bakkinselfhosted/src/eu/kanade/tachiyomi/extension/en/bakkinselfhosted/BakkinSelfHosted.kt
similarity index 100%
rename from multisrc/overrides/bakkin/bakkinselfhosted/src/BakkinSelfHosted.kt
rename to src/en/bakkinselfhosted/src/eu/kanade/tachiyomi/extension/en/bakkinselfhosted/BakkinSelfHosted.kt
diff --git a/src/en/bananamanga/build.gradle b/src/en/bananamanga/build.gradle
new file mode 100644
index 000000000..20bbe940e
--- /dev/null
+++ b/src/en/bananamanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Banana Manga'
+ extClass = '.BananaManga'
+ themePkg = 'madara'
+ baseUrl = 'https://bananamanga.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/bananamanga/res/mipmap-hdpi/ic_launcher.png b/src/en/bananamanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bananamanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/bananamanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bananamanga/res/mipmap-mdpi/ic_launcher.png b/src/en/bananamanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bananamanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/bananamanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bananamanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/bananamanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bananamanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/bananamanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bananamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/bananamanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bananamanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/bananamanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bananamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/bananamanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bananamanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/bananamanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bananamanga/src/BananaManga.kt b/src/en/bananamanga/src/eu/kanade/tachiyomi/extension/en/bananamanga/BananaManga.kt
similarity index 100%
rename from multisrc/overrides/madara/bananamanga/src/BananaManga.kt
rename to src/en/bananamanga/src/eu/kanade/tachiyomi/extension/en/bananamanga/BananaManga.kt
diff --git a/src/en/beehentai/build.gradle b/src/en/beehentai/build.gradle
new file mode 100644
index 000000000..5ee6a5bf0
--- /dev/null
+++ b/src/en/beehentai/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'BeeHentai'
+ extClass = '.BeeHentai'
+ themePkg = 'madtheme'
+ baseUrl = 'https://beehentai.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madtheme/beehentai/res/mipmap-hdpi/ic_launcher.png b/src/en/beehentai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/beehentai/res/mipmap-hdpi/ic_launcher.png
rename to src/en/beehentai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/beehentai/res/mipmap-mdpi/ic_launcher.png b/src/en/beehentai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/beehentai/res/mipmap-mdpi/ic_launcher.png
rename to src/en/beehentai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/beehentai/res/mipmap-xhdpi/ic_launcher.png b/src/en/beehentai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/beehentai/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/beehentai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/beehentai/res/mipmap-xxhdpi/ic_launcher.png b/src/en/beehentai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/beehentai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/beehentai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/beehentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/beehentai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/beehentai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/beehentai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/beehentai/src/eu/kanade/tachiyomi/extension/en/beehentai/BeeHentai.kt b/src/en/beehentai/src/eu/kanade/tachiyomi/extension/en/beehentai/BeeHentai.kt
new file mode 100644
index 000000000..c0a073c87
--- /dev/null
+++ b/src/en/beehentai/src/eu/kanade/tachiyomi/extension/en/beehentai/BeeHentai.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.beehentai
+
+import eu.kanade.tachiyomi.multisrc.madtheme.MadTheme
+
+class BeeHentai : MadTheme("BeeHentai", "https://beehentai.com", "en")
diff --git a/src/en/bestmanhua/build.gradle b/src/en/bestmanhua/build.gradle
new file mode 100644
index 000000000..f6e1dec8f
--- /dev/null
+++ b/src/en/bestmanhua/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'BestManhua'
+ extClass = '.BestManhua'
+ themePkg = 'madara'
+ baseUrl = 'https://bestmanhua.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/bestmanhua/res/mipmap-hdpi/ic_launcher.png b/src/en/bestmanhua/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bestmanhua/res/mipmap-hdpi/ic_launcher.png
rename to src/en/bestmanhua/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bestmanhua/res/mipmap-mdpi/ic_launcher.png b/src/en/bestmanhua/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bestmanhua/res/mipmap-mdpi/ic_launcher.png
rename to src/en/bestmanhua/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bestmanhua/res/mipmap-xhdpi/ic_launcher.png b/src/en/bestmanhua/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bestmanhua/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/bestmanhua/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bestmanhua/res/mipmap-xxhdpi/ic_launcher.png b/src/en/bestmanhua/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bestmanhua/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/bestmanhua/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bestmanhua/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/bestmanhua/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bestmanhua/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/bestmanhua/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/bestmanhua/src/eu/kanade/tachiyomi/extension/en/bestmanhua/BestManhua.kt b/src/en/bestmanhua/src/eu/kanade/tachiyomi/extension/en/bestmanhua/BestManhua.kt
new file mode 100644
index 000000000..c9ef1dce2
--- /dev/null
+++ b/src/en/bestmanhua/src/eu/kanade/tachiyomi/extension/en/bestmanhua/BestManhua.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.bestmanhua
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class BestManhua : Madara("BestManhua", "https://bestmanhua.com", "en")
diff --git a/src/en/birdmanga/build.gradle b/src/en/birdmanga/build.gradle
new file mode 100644
index 000000000..ab9f87b49
--- /dev/null
+++ b/src/en/birdmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'BirdManga'
+ extClass = '.BirdManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://birdmanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/birdmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/birdmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/birdmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/birdmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/birdmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/birdmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/birdmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/birdmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/birdmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/birdmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/birdmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/birdmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/birdmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/birdmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/birdmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/birdmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/birdmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/birdmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/birdmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/birdmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/birdmanga/src/BirdManga.kt b/src/en/birdmanga/src/eu/kanade/tachiyomi/extension/en/birdmanga/BirdManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/birdmanga/src/BirdManga.kt
rename to src/en/birdmanga/src/eu/kanade/tachiyomi/extension/en/birdmanga/BirdManga.kt
diff --git a/src/en/boxmanhwa/build.gradle b/src/en/boxmanhwa/build.gradle
new file mode 100644
index 000000000..48df73dec
--- /dev/null
+++ b/src/en/boxmanhwa/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'BoxManhwa'
+ extClass = '.BoxManhwa'
+ themePkg = 'madtheme'
+ baseUrl = 'https://boxmanhwa.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madtheme/boxmanhwa/res/mipmap-hdpi/ic_launcher.png b/src/en/boxmanhwa/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/boxmanhwa/res/mipmap-hdpi/ic_launcher.png
rename to src/en/boxmanhwa/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/boxmanhwa/res/mipmap-mdpi/ic_launcher.png b/src/en/boxmanhwa/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/boxmanhwa/res/mipmap-mdpi/ic_launcher.png
rename to src/en/boxmanhwa/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/boxmanhwa/res/mipmap-xhdpi/ic_launcher.png b/src/en/boxmanhwa/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/boxmanhwa/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/boxmanhwa/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/boxmanhwa/res/mipmap-xxhdpi/ic_launcher.png b/src/en/boxmanhwa/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/boxmanhwa/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/boxmanhwa/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/boxmanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/boxmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/boxmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/boxmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/boxmanhwa/src/eu/kanade/tachiyomi/extension/en/boxmanhwa/BoxManhwa.kt b/src/en/boxmanhwa/src/eu/kanade/tachiyomi/extension/en/boxmanhwa/BoxManhwa.kt
new file mode 100644
index 000000000..ef7dec863
--- /dev/null
+++ b/src/en/boxmanhwa/src/eu/kanade/tachiyomi/extension/en/boxmanhwa/BoxManhwa.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.boxmanhwa
+
+import eu.kanade.tachiyomi.multisrc.madtheme.MadTheme
+
+class BoxManhwa : MadTheme("BoxManhwa", "https://boxmanhwa.com", "en")
diff --git a/src/en/boyslove/build.gradle b/src/en/boyslove/build.gradle
new file mode 100644
index 000000000..dd6173e8f
--- /dev/null
+++ b/src/en/boyslove/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'BoysLove'
+ extClass = '.BoysLove'
+ themePkg = 'madara'
+ baseUrl = 'https://boyslove.me'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/boyslove/res/mipmap-hdpi/ic_launcher.png b/src/en/boyslove/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/boyslove/res/mipmap-hdpi/ic_launcher.png
rename to src/en/boyslove/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/boyslove/res/mipmap-mdpi/ic_launcher.png b/src/en/boyslove/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/boyslove/res/mipmap-mdpi/ic_launcher.png
rename to src/en/boyslove/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/boyslove/res/mipmap-xhdpi/ic_launcher.png b/src/en/boyslove/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/boyslove/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/boyslove/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/boyslove/res/mipmap-xxhdpi/ic_launcher.png b/src/en/boyslove/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/boyslove/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/boyslove/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/boyslove/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/boyslove/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/boyslove/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/boyslove/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/boyslove/src/eu/kanade/tachiyomi/extension/en/boyslove/BoysLove.kt b/src/en/boyslove/src/eu/kanade/tachiyomi/extension/en/boyslove/BoysLove.kt
new file mode 100644
index 000000000..71abe3e8b
--- /dev/null
+++ b/src/en/boyslove/src/eu/kanade/tachiyomi/extension/en/boyslove/BoysLove.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.boyslove
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class BoysLove : Madara("BoysLove", "https://boyslove.me", "en")
diff --git a/src/en/coffeemanga/build.gradle b/src/en/coffeemanga/build.gradle
new file mode 100644
index 000000000..62a66ee2c
--- /dev/null
+++ b/src/en/coffeemanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Coffee Manga'
+ extClass = '.CoffeeManga'
+ themePkg = 'madara'
+ baseUrl = 'https://coffeemanga.io'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/coffeemanga/res/mipmap-hdpi/ic_launcher.png b/src/en/coffeemanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/coffeemanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/coffeemanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/coffeemanga/res/mipmap-mdpi/ic_launcher.png b/src/en/coffeemanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/coffeemanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/coffeemanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/coffeemanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/coffeemanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/coffeemanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/coffeemanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/coffeemanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/coffeemanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/coffeemanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/coffeemanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/coffeemanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/coffeemanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/coffeemanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/coffeemanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/coffeemanga/src/CoffeeManga.kt b/src/en/coffeemanga/src/eu/kanade/tachiyomi/extension/en/coffeemanga/CoffeeManga.kt
similarity index 100%
rename from multisrc/overrides/madara/coffeemanga/src/CoffeeManga.kt
rename to src/en/coffeemanga/src/eu/kanade/tachiyomi/extension/en/coffeemanga/CoffeeManga.kt
diff --git a/src/en/coloredmanga/build.gradle b/src/en/coloredmanga/build.gradle
new file mode 100644
index 000000000..8e5651743
--- /dev/null
+++ b/src/en/coloredmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Colored Manga'
+ extClass = '.ColoredManga'
+ themePkg = 'madara'
+ baseUrl = 'https://coloredmanga.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/coloredmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/coloredmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/coloredmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/coloredmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/coloredmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/coloredmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/coloredmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/coloredmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/coloredmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/coloredmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/coloredmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/coloredmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/coloredmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/coloredmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/coloredmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/coloredmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/coloredmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/coloredmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/coloredmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/coloredmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/coloredmanga/src/ColoredManga.kt b/src/en/coloredmanga/src/eu/kanade/tachiyomi/extension/en/coloredmanga/ColoredManga.kt
similarity index 100%
rename from multisrc/overrides/madara/coloredmanga/src/ColoredManga.kt
rename to src/en/coloredmanga/src/eu/kanade/tachiyomi/extension/en/coloredmanga/ColoredManga.kt
diff --git a/src/en/comic1000/build.gradle b/src/en/comic1000/build.gradle
new file mode 100644
index 000000000..b60617333
--- /dev/null
+++ b/src/en/comic1000/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Comic1000'
+ extClass = '.Comic1000'
+ themePkg = 'manga18'
+ baseUrl = 'https://comic1000.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/comic1000/src/eu/kanade/tachiyomi/extension/en/comic1000/Comic1000.kt b/src/en/comic1000/src/eu/kanade/tachiyomi/extension/en/comic1000/Comic1000.kt
new file mode 100644
index 000000000..06dda4728
--- /dev/null
+++ b/src/en/comic1000/src/eu/kanade/tachiyomi/extension/en/comic1000/Comic1000.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.comic1000
+
+import eu.kanade.tachiyomi.multisrc.manga18.Manga18
+
+class Comic1000 : Manga18("Comic1000", "https://comic1000.com", "en")
diff --git a/src/en/comickiba/build.gradle b/src/en/comickiba/build.gradle
new file mode 100644
index 000000000..8007c2652
--- /dev/null
+++ b/src/en/comickiba/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhuagold'
+ extClass = '.Manhuagold'
+ themePkg = 'mangareader'
+ baseUrl = 'https://manhuagold.com'
+ overrideVersionCode = 33
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangareader/comickiba/res/mipmap-hdpi/ic_launcher.png b/src/en/comickiba/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/comickiba/res/mipmap-hdpi/ic_launcher.png
rename to src/en/comickiba/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/comickiba/res/mipmap-mdpi/ic_launcher.png b/src/en/comickiba/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/comickiba/res/mipmap-mdpi/ic_launcher.png
rename to src/en/comickiba/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/comickiba/res/mipmap-xhdpi/ic_launcher.png b/src/en/comickiba/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/comickiba/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/comickiba/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/comickiba/res/mipmap-xxhdpi/ic_launcher.png b/src/en/comickiba/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/comickiba/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/comickiba/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/comickiba/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/comickiba/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/comickiba/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/comickiba/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/comickiba/src/Manhuagold.kt b/src/en/comickiba/src/eu/kanade/tachiyomi/extension/en/comickiba/Manhuagold.kt
similarity index 100%
rename from multisrc/overrides/mangareader/comickiba/src/Manhuagold.kt
rename to src/en/comickiba/src/eu/kanade/tachiyomi/extension/en/comickiba/Manhuagold.kt
diff --git a/multisrc/overrides/mangareader/comickiba/src/ManhuagoldFilters.kt b/src/en/comickiba/src/eu/kanade/tachiyomi/extension/en/comickiba/ManhuagoldFilters.kt
similarity index 100%
rename from multisrc/overrides/mangareader/comickiba/src/ManhuagoldFilters.kt
rename to src/en/comickiba/src/eu/kanade/tachiyomi/extension/en/comickiba/ManhuagoldFilters.kt
diff --git a/src/en/comicscans/build.gradle b/src/en/comicscans/build.gradle
new file mode 100644
index 000000000..01e4e1223
--- /dev/null
+++ b/src/en/comicscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Comic Scans'
+ extClass = '.ComicScans'
+ themePkg = 'madara'
+ baseUrl = 'https://www.comicscans.org'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/comicscans/src/ComicScans.kt b/src/en/comicscans/src/eu/kanade/tachiyomi/extension/en/comicscans/ComicScans.kt
similarity index 100%
rename from multisrc/overrides/madara/comicscans/src/ComicScans.kt
rename to src/en/comicscans/src/eu/kanade/tachiyomi/extension/en/comicscans/ComicScans.kt
diff --git a/src/en/constellarscans/build.gradle b/src/en/constellarscans/build.gradle
new file mode 100644
index 000000000..e8a779461
--- /dev/null
+++ b/src/en/constellarscans/build.gradle
@@ -0,0 +1,14 @@
+ext {
+ extName = 'Constellar Scans'
+ extClass = '.ConstellarScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://constellarcomic.com'
+ overrideVersionCode = 16
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+ implementation(project(":lib:randomua"))
+}
diff --git a/multisrc/overrides/mangathemesia/constellarscans/res/mipmap-hdpi/ic_launcher.png b/src/en/constellarscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/constellarscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/constellarscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/constellarscans/res/mipmap-mdpi/ic_launcher.png b/src/en/constellarscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/constellarscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/constellarscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/constellarscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/constellarscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/constellarscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/constellarscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/constellarscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/constellarscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/constellarscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/constellarscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/constellarscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/constellarscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/constellarscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/constellarscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/constellarscans/src/ConstellarScans.kt b/src/en/constellarscans/src/eu/kanade/tachiyomi/extension/en/constellarscans/ConstellarScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/constellarscans/src/ConstellarScans.kt
rename to src/en/constellarscans/src/eu/kanade/tachiyomi/extension/en/constellarscans/ConstellarScans.kt
diff --git a/src/en/cookiekiara/build.gradle b/src/en/cookiekiara/build.gradle
new file mode 100644
index 000000000..5c2889158
--- /dev/null
+++ b/src/en/cookiekiara/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Cookie Kiara'
+ extClass = '.CookieKiara'
+ themePkg = 'madara'
+ baseUrl = 'https://18.kiara.cool'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/cookiekiara/res/mipmap-hdpi/ic_launcher.png b/src/en/cookiekiara/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cookiekiara/res/mipmap-hdpi/ic_launcher.png
rename to src/en/cookiekiara/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cookiekiara/res/mipmap-mdpi/ic_launcher.png b/src/en/cookiekiara/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cookiekiara/res/mipmap-mdpi/ic_launcher.png
rename to src/en/cookiekiara/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cookiekiara/res/mipmap-xhdpi/ic_launcher.png b/src/en/cookiekiara/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cookiekiara/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/cookiekiara/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cookiekiara/res/mipmap-xxhdpi/ic_launcher.png b/src/en/cookiekiara/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cookiekiara/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/cookiekiara/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cookiekiara/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/cookiekiara/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cookiekiara/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/cookiekiara/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cookiekiara/src/CookieKiara.kt b/src/en/cookiekiara/src/eu/kanade/tachiyomi/extension/en/cookiekiara/CookieKiara.kt
similarity index 100%
rename from multisrc/overrides/madara/cookiekiara/src/CookieKiara.kt
rename to src/en/cookiekiara/src/eu/kanade/tachiyomi/extension/en/cookiekiara/CookieKiara.kt
diff --git a/src/en/cosmicscans/build.gradle b/src/en/cosmicscans/build.gradle
new file mode 100644
index 000000000..9bc00f1f8
--- /dev/null
+++ b/src/en/cosmicscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Cosmic Scans'
+ extClass = '.CosmicScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://cosmic-scans.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/cosmicscans/res/mipmap-hdpi/ic_launcher.png b/src/en/cosmicscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cosmicscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/cosmicscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cosmicscans/res/mipmap-mdpi/ic_launcher.png b/src/en/cosmicscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cosmicscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/cosmicscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cosmicscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/cosmicscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cosmicscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/cosmicscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cosmicscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/cosmicscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cosmicscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/cosmicscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cosmicscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/cosmicscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cosmicscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/cosmicscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cosmicscans/src/CosmicScans.kt b/src/en/cosmicscans/src/eu/kanade/tachiyomi/extension/en/cosmicscans/CosmicScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/cosmicscans/src/CosmicScans.kt
rename to src/en/cosmicscans/src/eu/kanade/tachiyomi/extension/en/cosmicscans/CosmicScans.kt
diff --git a/src/en/creepyscans/build.gradle b/src/en/creepyscans/build.gradle
new file mode 100644
index 000000000..68ceddd39
--- /dev/null
+++ b/src/en/creepyscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'CreepyScans'
+ extClass = '.CreepyScans'
+ themePkg = 'madara'
+ baseUrl = 'https://creepyscans.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/creepyscans/res/mipmap-hdpi/ic_launcher.png b/src/en/creepyscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/creepyscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/creepyscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/creepyscans/res/mipmap-mdpi/ic_launcher.png b/src/en/creepyscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/creepyscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/creepyscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/creepyscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/creepyscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/creepyscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/creepyscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/creepyscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/creepyscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/creepyscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/creepyscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/creepyscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/creepyscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/creepyscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/creepyscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/creepyscans/src/CreepyScans.kt b/src/en/creepyscans/src/eu/kanade/tachiyomi/extension/en/creepyscans/CreepyScans.kt
similarity index 100%
rename from multisrc/overrides/madara/creepyscans/src/CreepyScans.kt
rename to src/en/creepyscans/src/eu/kanade/tachiyomi/extension/en/creepyscans/CreepyScans.kt
diff --git a/src/en/culturedworks/build.gradle b/src/en/culturedworks/build.gradle
new file mode 100644
index 000000000..85bc14eef
--- /dev/null
+++ b/src/en/culturedworks/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'CulturedWorks'
+ extClass = '.CulturedWorks'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://culturedworks.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/culturedworks/res/mipmap-hdpi/ic_launcher.png b/src/en/culturedworks/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/culturedworks/res/mipmap-hdpi/ic_launcher.png
rename to src/en/culturedworks/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/culturedworks/res/mipmap-mdpi/ic_launcher.png b/src/en/culturedworks/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/culturedworks/res/mipmap-mdpi/ic_launcher.png
rename to src/en/culturedworks/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/culturedworks/res/mipmap-xhdpi/ic_launcher.png b/src/en/culturedworks/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/culturedworks/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/culturedworks/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/culturedworks/res/mipmap-xxhdpi/ic_launcher.png b/src/en/culturedworks/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/culturedworks/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/culturedworks/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/culturedworks/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/culturedworks/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/culturedworks/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/culturedworks/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/culturedworks/src/CulturedWorks.kt b/src/en/culturedworks/src/eu/kanade/tachiyomi/extension/en/culturedworks/CulturedWorks.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/culturedworks/src/CulturedWorks.kt
rename to src/en/culturedworks/src/eu/kanade/tachiyomi/extension/en/culturedworks/CulturedWorks.kt
diff --git a/src/en/cypherscans/build.gradle b/src/en/cypherscans/build.gradle
new file mode 100644
index 000000000..ca4f51058
--- /dev/null
+++ b/src/en/cypherscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Cypher Scans'
+ extClass = '.CypherScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://cypherscans.xyz'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/cypherscans/res/mipmap-hdpi/ic_launcher.png b/src/en/cypherscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cypherscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/cypherscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cypherscans/res/mipmap-mdpi/ic_launcher.png b/src/en/cypherscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cypherscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/cypherscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cypherscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/cypherscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cypherscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/cypherscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cypherscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/cypherscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cypherscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/cypherscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cypherscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/cypherscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cypherscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/cypherscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/cypherscans/src/eu/kanade/tachiyomi/extension/en/cypherscans/CypherScans.kt b/src/en/cypherscans/src/eu/kanade/tachiyomi/extension/en/cypherscans/CypherScans.kt
new file mode 100644
index 000000000..dd25156b6
--- /dev/null
+++ b/src/en/cypherscans/src/eu/kanade/tachiyomi/extension/en/cypherscans/CypherScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.cypherscans
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class CypherScans : MangaThemesia("Cypher Scans", "https://cypherscans.xyz", "en")
diff --git a/src/en/dankefurslesen/build.gradle b/src/en/dankefurslesen/build.gradle
new file mode 100644
index 000000000..1eef11fae
--- /dev/null
+++ b/src/en/dankefurslesen/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Danke fürs Lesen'
+ extClass = '.DankeFursLesen'
+ themePkg = 'guya'
+ baseUrl = 'https://danke.moe'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/guya/dankefurslesen/res/mipmap-hdpi/ic_launcher.png b/src/en/dankefurslesen/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/dankefurslesen/res/mipmap-hdpi/ic_launcher.png
rename to src/en/dankefurslesen/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/dankefurslesen/res/mipmap-mdpi/ic_launcher.png b/src/en/dankefurslesen/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/dankefurslesen/res/mipmap-mdpi/ic_launcher.png
rename to src/en/dankefurslesen/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/dankefurslesen/res/mipmap-xhdpi/ic_launcher.png b/src/en/dankefurslesen/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/dankefurslesen/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/dankefurslesen/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/dankefurslesen/res/mipmap-xxhdpi/ic_launcher.png b/src/en/dankefurslesen/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/dankefurslesen/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/dankefurslesen/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/dankefurslesen/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/dankefurslesen/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/dankefurslesen/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/dankefurslesen/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/dankefurslesen/src/eu/kanade/tachiyomi/extension/en/dankefurslesen/DankeFursLesen.kt b/src/en/dankefurslesen/src/eu/kanade/tachiyomi/extension/en/dankefurslesen/DankeFursLesen.kt
new file mode 100644
index 000000000..c20d9a52e
--- /dev/null
+++ b/src/en/dankefurslesen/src/eu/kanade/tachiyomi/extension/en/dankefurslesen/DankeFursLesen.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.dankefurslesen
+
+import eu.kanade.tachiyomi.multisrc.guya.Guya
+
+class DankeFursLesen : Guya("Danke fürs Lesen", "https://danke.moe", "en")
diff --git a/src/en/darkscan/build.gradle b/src/en/darkscan/build.gradle
new file mode 100644
index 000000000..c7c1986c3
--- /dev/null
+++ b/src/en/darkscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Dark-scan'
+ extClass = '.DarkScan'
+ themePkg = 'madara'
+ baseUrl = 'https://dark-scan.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/darkscan/res/mipmap-hdpi/ic_launcher.png b/src/en/darkscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/darkscan/res/mipmap-hdpi/ic_launcher.png
rename to src/en/darkscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/darkscan/res/mipmap-mdpi/ic_launcher.png b/src/en/darkscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/darkscan/res/mipmap-mdpi/ic_launcher.png
rename to src/en/darkscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/darkscan/res/mipmap-xhdpi/ic_launcher.png b/src/en/darkscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/darkscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/darkscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/darkscan/res/mipmap-xxhdpi/ic_launcher.png b/src/en/darkscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/darkscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/darkscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/darkscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/darkscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/darkscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/darkscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/darkscan/src/DarkScan.kt b/src/en/darkscan/src/eu/kanade/tachiyomi/extension/en/darkscan/DarkScan.kt
similarity index 100%
rename from multisrc/overrides/madara/darkscan/src/DarkScan.kt
rename to src/en/darkscan/src/eu/kanade/tachiyomi/extension/en/darkscan/DarkScan.kt
diff --git a/src/en/darkscans/build.gradle b/src/en/darkscans/build.gradle
new file mode 100644
index 000000000..3443b1a94
--- /dev/null
+++ b/src/en/darkscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Dark Scans'
+ extClass = '.DarkScans'
+ themePkg = 'madara'
+ baseUrl = 'https://darkscans.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/darkscans/res/mipmap-hdpi/ic_launcher.png b/src/en/darkscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/darkscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/darkscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/darkscans/res/mipmap-mdpi/ic_launcher.png b/src/en/darkscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/darkscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/darkscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/darkscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/darkscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/darkscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/darkscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/darkscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/darkscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/darkscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/darkscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/darkscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/darkscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/darkscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/darkscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/darkscans/src/DarkScans.kt b/src/en/darkscans/src/eu/kanade/tachiyomi/extension/en/darkscans/DarkScans.kt
similarity index 100%
rename from multisrc/overrides/madara/darkscans/src/DarkScans.kt
rename to src/en/darkscans/src/eu/kanade/tachiyomi/extension/en/darkscans/DarkScans.kt
diff --git a/src/en/deathtollscans/build.gradle b/src/en/deathtollscans/build.gradle
new file mode 100644
index 000000000..653b3a23b
--- /dev/null
+++ b/src/en/deathtollscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Death Toll Scans'
+ extClass = '.DeathTollScans'
+ themePkg = 'foolslide'
+ baseUrl = 'https://reader.deathtollscans.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/foolslide/deathtollscans/res/mipmap-hdpi/ic_launcher.png b/src/en/deathtollscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/deathtollscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/deathtollscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/deathtollscans/res/mipmap-mdpi/ic_launcher.png b/src/en/deathtollscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/deathtollscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/deathtollscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/deathtollscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/deathtollscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/deathtollscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/deathtollscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/deathtollscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/deathtollscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/deathtollscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/deathtollscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/deathtollscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/deathtollscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/deathtollscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/deathtollscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/deathtollscans/src/eu/kanade/tachiyomi/extension/en/deathtollscans/DeathTollScans.kt b/src/en/deathtollscans/src/eu/kanade/tachiyomi/extension/en/deathtollscans/DeathTollScans.kt
new file mode 100644
index 000000000..bcceb5168
--- /dev/null
+++ b/src/en/deathtollscans/src/eu/kanade/tachiyomi/extension/en/deathtollscans/DeathTollScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.deathtollscans
+
+import eu.kanade.tachiyomi.multisrc.foolslide.FoolSlide
+
+class DeathTollScans : FoolSlide("Death Toll Scans", "https://reader.deathtollscans.net", "en")
diff --git a/src/en/decadencescans/build.gradle b/src/en/decadencescans/build.gradle
new file mode 100644
index 000000000..d5eee78a0
--- /dev/null
+++ b/src/en/decadencescans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Decadence Scans'
+ extClass = '.DecadenceScans'
+ themePkg = 'madara'
+ baseUrl = 'https://reader.decadencescans.com'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/decadencescans/res/mipmap-hdpi/ic_launcher.png b/src/en/decadencescans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/decadencescans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/decadencescans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/decadencescans/res/mipmap-mdpi/ic_launcher.png b/src/en/decadencescans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/decadencescans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/decadencescans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/decadencescans/res/mipmap-xhdpi/ic_launcher.png b/src/en/decadencescans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/decadencescans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/decadencescans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/decadencescans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/decadencescans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/decadencescans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/decadencescans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/decadencescans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/decadencescans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/decadencescans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/decadencescans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/decadencescans/src/DecadenceScans.kt b/src/en/decadencescans/src/eu/kanade/tachiyomi/extension/en/decadencescans/DecadenceScans.kt
similarity index 100%
rename from multisrc/overrides/madara/decadencescans/src/DecadenceScans.kt
rename to src/en/decadencescans/src/eu/kanade/tachiyomi/extension/en/decadencescans/DecadenceScans.kt
diff --git a/src/en/dragontea/build.gradle b/src/en/dragontea/build.gradle
new file mode 100644
index 000000000..208a20c82
--- /dev/null
+++ b/src/en/dragontea/build.gradle
@@ -0,0 +1,13 @@
+ext {
+ extName = 'DragonTea'
+ extClass = '.DragonTea'
+ themePkg = 'madara'
+ baseUrl = 'https://dragontea.ink'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+ implementation(project(":lib:cryptoaes"))
+}
diff --git a/multisrc/overrides/madara/dragontea/res/mipmap-hdpi/ic_launcher.png b/src/en/dragontea/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dragontea/res/mipmap-hdpi/ic_launcher.png
rename to src/en/dragontea/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dragontea/res/mipmap-mdpi/ic_launcher.png b/src/en/dragontea/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dragontea/res/mipmap-mdpi/ic_launcher.png
rename to src/en/dragontea/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dragontea/res/mipmap-xhdpi/ic_launcher.png b/src/en/dragontea/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dragontea/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/dragontea/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dragontea/res/mipmap-xxhdpi/ic_launcher.png b/src/en/dragontea/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dragontea/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/dragontea/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dragontea/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/dragontea/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dragontea/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/dragontea/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dragontea/src/DragonTea.kt b/src/en/dragontea/src/eu/kanade/tachiyomi/extension/en/dragontea/DragonTea.kt
similarity index 100%
rename from multisrc/overrides/madara/dragontea/src/DragonTea.kt
rename to src/en/dragontea/src/eu/kanade/tachiyomi/extension/en/dragontea/DragonTea.kt
diff --git a/src/en/drakescans/build.gradle b/src/en/drakescans/build.gradle
new file mode 100644
index 000000000..182ad5a5a
--- /dev/null
+++ b/src/en/drakescans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Drake Scans'
+ extClass = '.DrakeScans'
+ themePkg = 'madara'
+ baseUrl = 'https://drakescans.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/drakescans/res/mipmap-hdpi/ic_launcher.png b/src/en/drakescans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/drakescans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/drakescans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/drakescans/res/mipmap-mdpi/ic_launcher.png b/src/en/drakescans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/drakescans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/drakescans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/drakescans/res/mipmap-xhdpi/ic_launcher.png b/src/en/drakescans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/drakescans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/drakescans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/drakescans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/drakescans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/drakescans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/drakescans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/drakescans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/drakescans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/drakescans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/drakescans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/drakescans/src/DrakeScans.kt b/src/en/drakescans/src/eu/kanade/tachiyomi/extension/en/drakescans/DrakeScans.kt
similarity index 100%
rename from multisrc/overrides/madara/drakescans/src/DrakeScans.kt
rename to src/en/drakescans/src/eu/kanade/tachiyomi/extension/en/drakescans/DrakeScans.kt
diff --git a/src/en/eighteenporncomic/build.gradle b/src/en/eighteenporncomic/build.gradle
new file mode 100644
index 000000000..2b7ae2d6a
--- /dev/null
+++ b/src/en/eighteenporncomic/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = '18 Porn Comic'
+ extClass = '.EighteenPornComic'
+ themePkg = 'manga18'
+ baseUrl = 'https://18porncomic.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/eighteenporncomic/src/eu/kanade/tachiyomi/extension/en/eighteenporncomic/EighteenPornComic.kt b/src/en/eighteenporncomic/src/eu/kanade/tachiyomi/extension/en/eighteenporncomic/EighteenPornComic.kt
new file mode 100644
index 000000000..21890fd35
--- /dev/null
+++ b/src/en/eighteenporncomic/src/eu/kanade/tachiyomi/extension/en/eighteenporncomic/EighteenPornComic.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.eighteenporncomic
+
+import eu.kanade.tachiyomi.multisrc.manga18.Manga18
+
+class EighteenPornComic : Manga18("18 Porn Comic", "https://18porncomic.com", "en")
diff --git a/src/en/eightmuses/build.gradle b/src/en/eightmuses/build.gradle
new file mode 100644
index 000000000..33be86d2e
--- /dev/null
+++ b/src/en/eightmuses/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = '8Muses'
+ extClass = '.EightMuses'
+ themePkg = 'eromuse'
+ baseUrl = 'https://comics.8muses.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/eromuse/eightmuses/res/mipmap-hdpi/ic_launcher.png b/src/en/eightmuses/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/eightmuses/res/mipmap-hdpi/ic_launcher.png
rename to src/en/eightmuses/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/eightmuses/res/mipmap-mdpi/ic_launcher.png b/src/en/eightmuses/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/eightmuses/res/mipmap-mdpi/ic_launcher.png
rename to src/en/eightmuses/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/eightmuses/res/mipmap-xhdpi/ic_launcher.png b/src/en/eightmuses/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/eightmuses/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/eightmuses/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/eightmuses/res/mipmap-xxhdpi/ic_launcher.png b/src/en/eightmuses/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/eightmuses/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/eightmuses/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/eightmuses/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/eightmuses/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/eightmuses/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/eightmuses/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/eightmuses/src/EightMuses.kt b/src/en/eightmuses/src/eu/kanade/tachiyomi/extension/en/eightmuses/EightMuses.kt
similarity index 100%
rename from multisrc/overrides/eromuse/eightmuses/src/EightMuses.kt
rename to src/en/eightmuses/src/eu/kanade/tachiyomi/extension/en/eightmuses/EightMuses.kt
diff --git a/src/en/elarcpage/build.gradle b/src/en/elarcpage/build.gradle
new file mode 100644
index 000000000..b2cde9d21
--- /dev/null
+++ b/src/en/elarcpage/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Elarc Toon'
+ extClass = '.ElarcPage'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://elarctoon.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/elarcpage/res/mipmap-hdpi/ic_launcher.png b/src/en/elarcpage/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/elarcpage/res/mipmap-hdpi/ic_launcher.png
rename to src/en/elarcpage/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/elarcpage/res/mipmap-mdpi/ic_launcher.png b/src/en/elarcpage/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/elarcpage/res/mipmap-mdpi/ic_launcher.png
rename to src/en/elarcpage/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/elarcpage/res/mipmap-xhdpi/ic_launcher.png b/src/en/elarcpage/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/elarcpage/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/elarcpage/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/elarcpage/res/mipmap-xxhdpi/ic_launcher.png b/src/en/elarcpage/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/elarcpage/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/elarcpage/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/elarcpage/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/elarcpage/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/elarcpage/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/elarcpage/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/elarcpage/src/ElarcPage.kt b/src/en/elarcpage/src/eu/kanade/tachiyomi/extension/en/elarcpage/ElarcPage.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/elarcpage/src/ElarcPage.kt
rename to src/en/elarcpage/src/eu/kanade/tachiyomi/extension/en/elarcpage/ElarcPage.kt
diff --git a/src/en/elitemanga/build.gradle b/src/en/elitemanga/build.gradle
new file mode 100644
index 000000000..98c9c0726
--- /dev/null
+++ b/src/en/elitemanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Elite Manga'
+ extClass = '.EliteManga'
+ themePkg = 'madara'
+ baseUrl = 'https://www.elitemanga.org'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/elitemanga/res/mipmap-hdpi/ic_launcher.png b/src/en/elitemanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/elitemanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/elitemanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/elitemanga/res/mipmap-mdpi/ic_launcher.png b/src/en/elitemanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/elitemanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/elitemanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/elitemanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/elitemanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/elitemanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/elitemanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/elitemanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/elitemanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/elitemanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/elitemanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/elitemanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/elitemanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/elitemanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/elitemanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/elitemanga/src/EliteManga.kt b/src/en/elitemanga/src/eu/kanade/tachiyomi/extension/en/elitemanga/EliteManga.kt
similarity index 100%
rename from multisrc/overrides/madara/elitemanga/src/EliteManga.kt
rename to src/en/elitemanga/src/eu/kanade/tachiyomi/extension/en/elitemanga/EliteManga.kt
diff --git a/src/en/enryumanga/build.gradle b/src/en/enryumanga/build.gradle
new file mode 100644
index 000000000..c8534a831
--- /dev/null
+++ b/src/en/enryumanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'EnryuManga'
+ extClass = '.EnryuManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://enryumanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/enryumanga/res/mipmap-hdpi/ic_launcher.png b/src/en/enryumanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/enryumanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/enryumanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/enryumanga/res/mipmap-mdpi/ic_launcher.png b/src/en/enryumanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/enryumanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/enryumanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/enryumanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/enryumanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/enryumanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/enryumanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/enryumanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/enryumanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/enryumanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/enryumanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/enryumanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/enryumanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/enryumanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/enryumanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/enryumanga/src/EnryuManga.kt b/src/en/enryumanga/src/eu/kanade/tachiyomi/extension/en/enryumanga/EnryuManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/enryumanga/src/EnryuManga.kt
rename to src/en/enryumanga/src/eu/kanade/tachiyomi/extension/en/enryumanga/EnryuManga.kt
diff --git a/src/en/erofus/build.gradle b/src/en/erofus/build.gradle
new file mode 100644
index 000000000..61f1e6676
--- /dev/null
+++ b/src/en/erofus/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Erofus'
+ extClass = '.Erofus'
+ themePkg = 'eromuse'
+ baseUrl = 'https://www.erofus.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/eromuse/erofus/res/mipmap-hdpi/ic_launcher.png b/src/en/erofus/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/erofus/res/mipmap-hdpi/ic_launcher.png
rename to src/en/erofus/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/erofus/res/mipmap-mdpi/ic_launcher.png b/src/en/erofus/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/erofus/res/mipmap-mdpi/ic_launcher.png
rename to src/en/erofus/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/erofus/res/mipmap-xhdpi/ic_launcher.png b/src/en/erofus/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/erofus/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/erofus/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/erofus/res/mipmap-xxhdpi/ic_launcher.png b/src/en/erofus/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/erofus/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/erofus/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/erofus/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/erofus/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/eromuse/erofus/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/erofus/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/eromuse/erofus/src/Erofus.kt b/src/en/erofus/src/eu/kanade/tachiyomi/extension/en/erofus/Erofus.kt
similarity index 100%
rename from multisrc/overrides/eromuse/erofus/src/Erofus.kt
rename to src/en/erofus/src/eu/kanade/tachiyomi/extension/en/erofus/Erofus.kt
diff --git a/src/en/evilflowers/build.gradle b/src/en/evilflowers/build.gradle
new file mode 100644
index 000000000..d849fa746
--- /dev/null
+++ b/src/en/evilflowers/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Evil Flowers'
+ extClass = '.EvilFlowers'
+ themePkg = 'foolslide'
+ baseUrl = 'https://reader.evilflowers.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/foolslide/evilflowers/res/mipmap-hdpi/ic_launcher.png b/src/en/evilflowers/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/evilflowers/res/mipmap-hdpi/ic_launcher.png
rename to src/en/evilflowers/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/evilflowers/res/mipmap-mdpi/ic_launcher.png b/src/en/evilflowers/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/evilflowers/res/mipmap-mdpi/ic_launcher.png
rename to src/en/evilflowers/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/evilflowers/res/mipmap-xhdpi/ic_launcher.png b/src/en/evilflowers/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/evilflowers/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/evilflowers/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/evilflowers/res/mipmap-xxhdpi/ic_launcher.png b/src/en/evilflowers/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/evilflowers/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/evilflowers/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/evilflowers/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/evilflowers/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/evilflowers/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/evilflowers/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/evilflowers/src/eu/kanade/tachiyomi/extension/en/evilflowers/EvilFlowers.kt b/src/en/evilflowers/src/eu/kanade/tachiyomi/extension/en/evilflowers/EvilFlowers.kt
new file mode 100644
index 000000000..b5cfba71d
--- /dev/null
+++ b/src/en/evilflowers/src/eu/kanade/tachiyomi/extension/en/evilflowers/EvilFlowers.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.evilflowers
+
+import eu.kanade.tachiyomi.multisrc.foolslide.FoolSlide
+
+class EvilFlowers : FoolSlide("Evil Flowers", "https://reader.evilflowers.com", "en")
diff --git a/src/en/ezmanga/build.gradle b/src/en/ezmanga/build.gradle
new file mode 100644
index 000000000..086c1006d
--- /dev/null
+++ b/src/en/ezmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'EZmanga'
+ extClass = '.EZmanga'
+ themePkg = 'madara'
+ baseUrl = 'https://ezmanga.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/ezmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/ezmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ezmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/ezmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ezmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/ezmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ezmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/ezmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ezmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/ezmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ezmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/ezmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ezmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/ezmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ezmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/ezmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ezmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/ezmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ezmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/ezmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ezmanga/src/EZmanga.kt b/src/en/ezmanga/src/eu/kanade/tachiyomi/extension/en/ezmanga/EZmanga.kt
similarity index 100%
rename from multisrc/overrides/madara/ezmanga/src/EZmanga.kt
rename to src/en/ezmanga/src/eu/kanade/tachiyomi/extension/en/ezmanga/EZmanga.kt
diff --git a/src/en/factmanga/build.gradle b/src/en/factmanga/build.gradle
new file mode 100644
index 000000000..a4285550e
--- /dev/null
+++ b/src/en/factmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'FactManga'
+ extClass = '.FactManga'
+ themePkg = 'madara'
+ baseUrl = 'https://factmanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/factmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/factmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/factmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/factmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/factmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/factmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/factmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/factmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/factmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/factmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/factmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/factmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/factmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/factmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/factmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/factmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/factmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/factmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/factmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/factmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/factmanga/src/FactManga.kt b/src/en/factmanga/src/eu/kanade/tachiyomi/extension/en/factmanga/FactManga.kt
similarity index 100%
rename from multisrc/overrides/madara/factmanga/src/FactManga.kt
rename to src/en/factmanga/src/eu/kanade/tachiyomi/extension/en/factmanga/FactManga.kt
diff --git a/src/en/firescans/build.gradle b/src/en/firescans/build.gradle
new file mode 100644
index 000000000..443d54c9f
--- /dev/null
+++ b/src/en/firescans/build.gradle
@@ -0,0 +1,13 @@
+ext {
+ extName = 'Fire Scans'
+ extClass = '.FireScans'
+ themePkg = 'madara'
+ baseUrl = 'https://firescans.xyz'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+ implementation(project(":lib:cryptoaes"))
+}
diff --git a/multisrc/overrides/madara/firescans/res/mipmap-hdpi/ic_launcher.png b/src/en/firescans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firescans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/firescans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firescans/res/mipmap-mdpi/ic_launcher.png b/src/en/firescans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firescans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/firescans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firescans/res/mipmap-xhdpi/ic_launcher.png b/src/en/firescans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firescans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/firescans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firescans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/firescans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firescans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/firescans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firescans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/firescans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firescans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/firescans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firescans/src/FireScans.kt b/src/en/firescans/src/eu/kanade/tachiyomi/extension/en/firescans/FireScans.kt
similarity index 100%
rename from multisrc/overrides/madara/firescans/src/FireScans.kt
rename to src/en/firescans/src/eu/kanade/tachiyomi/extension/en/firescans/FireScans.kt
diff --git a/src/en/firstkissdashmanga/build.gradle b/src/en/firstkissdashmanga/build.gradle
new file mode 100644
index 000000000..868ede273
--- /dev/null
+++ b/src/en/firstkissdashmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = '1st Kiss-Manga (unoriginal)'
+ extClass = '.FirstKissDashManga'
+ themePkg = 'madara'
+ baseUrl = 'https://1stkiss-manga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/firstkissdashmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/firstkissdashmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firstkissdashmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/firstkissdashmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firstkissdashmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/firstkissdashmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firstkissdashmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/firstkissdashmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firstkissdashmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/firstkissdashmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firstkissdashmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/firstkissdashmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firstkissdashmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/firstkissdashmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firstkissdashmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/firstkissdashmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firstkissdashmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/firstkissdashmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firstkissdashmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/firstkissdashmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firstkissdashmanga/src/FirstKissDashManga.kt b/src/en/firstkissdashmanga/src/eu/kanade/tachiyomi/extension/en/firstkissdashmanga/FirstKissDashManga.kt
similarity index 100%
rename from multisrc/overrides/madara/firstkissdashmanga/src/FirstKissDashManga.kt
rename to src/en/firstkissdashmanga/src/eu/kanade/tachiyomi/extension/en/firstkissdashmanga/FirstKissDashManga.kt
diff --git a/src/en/firstmanhwa/build.gradle b/src/en/firstmanhwa/build.gradle
new file mode 100644
index 000000000..8654e3858
--- /dev/null
+++ b/src/en/firstmanhwa/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = '1st Manhwa'
+ extClass = '.FirstManhwa'
+ themePkg = 'madara'
+ baseUrl = 'https://1stmanhwa.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/firstmanhwa/res/mipmap-hdpi/ic_launcher.png b/src/en/firstmanhwa/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firstmanhwa/res/mipmap-hdpi/ic_launcher.png
rename to src/en/firstmanhwa/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firstmanhwa/res/mipmap-mdpi/ic_launcher.png b/src/en/firstmanhwa/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firstmanhwa/res/mipmap-mdpi/ic_launcher.png
rename to src/en/firstmanhwa/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firstmanhwa/res/mipmap-xhdpi/ic_launcher.png b/src/en/firstmanhwa/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firstmanhwa/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/firstmanhwa/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firstmanhwa/res/mipmap-xxhdpi/ic_launcher.png b/src/en/firstmanhwa/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firstmanhwa/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/firstmanhwa/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firstmanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/firstmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/firstmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/firstmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/firstmanhwa/src/FirstManhwa.kt b/src/en/firstmanhwa/src/eu/kanade/tachiyomi/extension/en/firstmanhwa/FirstManhwa.kt
similarity index 100%
rename from multisrc/overrides/madara/firstmanhwa/src/FirstManhwa.kt
rename to src/en/firstmanhwa/src/eu/kanade/tachiyomi/extension/en/firstmanhwa/FirstManhwa.kt
diff --git a/src/en/flamecomics/build.gradle b/src/en/flamecomics/build.gradle
new file mode 100644
index 000000000..b948ecc02
--- /dev/null
+++ b/src/en/flamecomics/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Flame Comics'
+ extClass = '.FlameComics'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://flamecomics.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/flamecomics/res/mipmap-hdpi/ic_launcher.png b/src/en/flamecomics/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/flamecomics/res/mipmap-hdpi/ic_launcher.png
rename to src/en/flamecomics/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/flamecomics/res/mipmap-mdpi/ic_launcher.png b/src/en/flamecomics/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/flamecomics/res/mipmap-mdpi/ic_launcher.png
rename to src/en/flamecomics/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/flamecomics/res/mipmap-xhdpi/ic_launcher.png b/src/en/flamecomics/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/flamecomics/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/flamecomics/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/flamecomics/res/mipmap-xxhdpi/ic_launcher.png b/src/en/flamecomics/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/flamecomics/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/flamecomics/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/flamecomics/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/flamecomics/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/flamecomics/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/flamecomics/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/flamecomics/src/FlameComics.kt b/src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComics.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/flamecomics/src/FlameComics.kt
rename to src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComics.kt
diff --git a/src/en/flixscans/build.gradle b/src/en/flixscans/build.gradle
new file mode 100644
index 000000000..56d117249
--- /dev/null
+++ b/src/en/flixscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Flix Scans'
+ extClass = '.FlixScansNet'
+ themePkg = 'flixscans'
+ baseUrl = 'https://flixscans.org'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/flixscans/flixscans/res/mipmap-hdpi/ic_launcher.png b/src/en/flixscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/flixscans/flixscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/flixscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/flixscans/flixscans/res/mipmap-mdpi/ic_launcher.png b/src/en/flixscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/flixscans/flixscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/flixscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/flixscans/flixscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/flixscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/flixscans/flixscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/flixscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/flixscans/flixscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/flixscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/flixscans/flixscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/flixscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/flixscans/flixscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/flixscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/flixscans/flixscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/flixscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/flixscans/src/eu/kanade/tachiyomi/extension/en/flixscans/FlixScansNet.kt b/src/en/flixscans/src/eu/kanade/tachiyomi/extension/en/flixscans/FlixScansNet.kt
new file mode 100644
index 000000000..ed443cfa1
--- /dev/null
+++ b/src/en/flixscans/src/eu/kanade/tachiyomi/extension/en/flixscans/FlixScansNet.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.flixscans
+
+import eu.kanade.tachiyomi.multisrc.flixscans.FlixScans
+
+class FlixScansNet : FlixScans("Flix Scans", "https://flixscans.org", "en")
diff --git a/src/en/freakscans/build.gradle b/src/en/freakscans/build.gradle
new file mode 100644
index 000000000..91a320b6e
--- /dev/null
+++ b/src/en/freakscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Freak Scans'
+ extClass = '.FreakScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://freakscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/freakscans/res/mipmap-hdpi/ic_launcher.png b/src/en/freakscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/freakscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/freakscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/freakscans/res/mipmap-mdpi/ic_launcher.png b/src/en/freakscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/freakscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/freakscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/freakscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/freakscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/freakscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/freakscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/freakscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/freakscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/freakscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/freakscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/freakscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/freakscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/freakscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/freakscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/freakscans/src/eu/kanade/tachiyomi/extension/en/freakscans/FreakScans.kt b/src/en/freakscans/src/eu/kanade/tachiyomi/extension/en/freakscans/FreakScans.kt
new file mode 100644
index 000000000..42b631234
--- /dev/null
+++ b/src/en/freakscans/src/eu/kanade/tachiyomi/extension/en/freakscans/FreakScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.freakscans
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class FreakScans : MangaThemesia("Freak Scans", "https://freakscans.com", "en")
diff --git a/src/en/freemanga/build.gradle b/src/en/freemanga/build.gradle
new file mode 100644
index 000000000..87147a765
--- /dev/null
+++ b/src/en/freemanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Free Manga'
+ extClass = '.FreeManga'
+ themePkg = 'madara'
+ baseUrl = 'https://freemanga.me'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/freemanga/res/mipmap-hdpi/ic_launcher.png b/src/en/freemanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freemanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/freemanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freemanga/res/mipmap-mdpi/ic_launcher.png b/src/en/freemanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freemanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/freemanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freemanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/freemanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freemanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/freemanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freemanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/freemanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freemanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/freemanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freemanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/freemanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freemanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/freemanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freemanga/src/FreeManga.kt b/src/en/freemanga/src/eu/kanade/tachiyomi/extension/en/freemanga/FreeManga.kt
similarity index 100%
rename from multisrc/overrides/madara/freemanga/src/FreeManga.kt
rename to src/en/freemanga/src/eu/kanade/tachiyomi/extension/en/freemanga/FreeManga.kt
diff --git a/src/en/freemangatop/build.gradle b/src/en/freemangatop/build.gradle
new file mode 100644
index 000000000..434ac9230
--- /dev/null
+++ b/src/en/freemangatop/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'FreeMangaTop'
+ extClass = '.FreeMangaTop'
+ themePkg = 'madara'
+ baseUrl = 'https://freemangatop.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/freemangatop/src/FreeMangaTop.kt b/src/en/freemangatop/src/eu/kanade/tachiyomi/extension/en/freemangatop/FreeMangaTop.kt
similarity index 100%
rename from multisrc/overrides/madara/freemangatop/src/FreeMangaTop.kt
rename to src/en/freemangatop/src/eu/kanade/tachiyomi/extension/en/freemangatop/FreeMangaTop.kt
diff --git a/src/en/freemanhwa/build.gradle b/src/en/freemanhwa/build.gradle
new file mode 100644
index 000000000..97e9b0773
--- /dev/null
+++ b/src/en/freemanhwa/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Free Manhwa'
+ extClass = '.FreeManhwa'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwas.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/freemanhwa/res/mipmap-hdpi/ic_launcher.png b/src/en/freemanhwa/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freemanhwa/res/mipmap-hdpi/ic_launcher.png
rename to src/en/freemanhwa/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freemanhwa/res/mipmap-mdpi/ic_launcher.png b/src/en/freemanhwa/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freemanhwa/res/mipmap-mdpi/ic_launcher.png
rename to src/en/freemanhwa/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freemanhwa/res/mipmap-xhdpi/ic_launcher.png b/src/en/freemanhwa/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freemanhwa/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/freemanhwa/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freemanhwa/res/mipmap-xxhdpi/ic_launcher.png b/src/en/freemanhwa/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freemanhwa/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/freemanhwa/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freemanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/freemanhwa/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freemanhwa/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/freemanhwa/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freemanhwa/src/FreeManhwa.kt b/src/en/freemanhwa/src/eu/kanade/tachiyomi/extension/en/freemanhwa/FreeManhwa.kt
similarity index 100%
rename from multisrc/overrides/madara/freemanhwa/src/FreeManhwa.kt
rename to src/en/freemanhwa/src/eu/kanade/tachiyomi/extension/en/freemanhwa/FreeManhwa.kt
diff --git a/src/en/freewebtooncoins/build.gradle b/src/en/freewebtooncoins/build.gradle
new file mode 100644
index 000000000..d092b8b8a
--- /dev/null
+++ b/src/en/freewebtooncoins/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'FreeWebtoonCoins'
+ extClass = '.FreeWebtoonCoins'
+ themePkg = 'madara'
+ baseUrl = 'https://freewebtooncoins.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/freewebtooncoins/res/mipmap-hdpi/ic_launcher.png b/src/en/freewebtooncoins/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freewebtooncoins/res/mipmap-hdpi/ic_launcher.png
rename to src/en/freewebtooncoins/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freewebtooncoins/res/mipmap-mdpi/ic_launcher.png b/src/en/freewebtooncoins/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freewebtooncoins/res/mipmap-mdpi/ic_launcher.png
rename to src/en/freewebtooncoins/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freewebtooncoins/res/mipmap-xhdpi/ic_launcher.png b/src/en/freewebtooncoins/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freewebtooncoins/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/freewebtooncoins/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freewebtooncoins/res/mipmap-xxhdpi/ic_launcher.png b/src/en/freewebtooncoins/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freewebtooncoins/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/freewebtooncoins/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/freewebtooncoins/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/freewebtooncoins/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/freewebtooncoins/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/freewebtooncoins/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/freewebtooncoins/src/eu/kanade/tachiyomi/extension/en/freewebtooncoins/FreeWebtoonCoins.kt b/src/en/freewebtooncoins/src/eu/kanade/tachiyomi/extension/en/freewebtooncoins/FreeWebtoonCoins.kt
new file mode 100644
index 000000000..f78ea45ed
--- /dev/null
+++ b/src/en/freewebtooncoins/src/eu/kanade/tachiyomi/extension/en/freewebtooncoins/FreeWebtoonCoins.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.freewebtooncoins
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class FreeWebtoonCoins : Madara("FreeWebtoonCoins", "https://freewebtooncoins.com", "en")
diff --git a/src/en/galaxydegenscans/build.gradle b/src/en/galaxydegenscans/build.gradle
new file mode 100644
index 000000000..90b256950
--- /dev/null
+++ b/src/en/galaxydegenscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'GalaxyDegenScans'
+ extClass = '.GalaxyDegenScans'
+ themePkg = 'madara'
+ baseUrl = 'https://gdscans.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/galaxydegenscans/res/mipmap-hdpi/ic_launcher.png b/src/en/galaxydegenscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/galaxydegenscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/galaxydegenscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/galaxydegenscans/res/mipmap-mdpi/ic_launcher.png b/src/en/galaxydegenscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/galaxydegenscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/galaxydegenscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/galaxydegenscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/galaxydegenscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/galaxydegenscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/galaxydegenscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/galaxydegenscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/galaxydegenscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/galaxydegenscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/galaxydegenscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/galaxydegenscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/galaxydegenscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/galaxydegenscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/galaxydegenscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/galaxydegenscans/src/eu/kanade/tachiyomi/extension/en/galaxydegenscans/GalaxyDegenScans.kt b/src/en/galaxydegenscans/src/eu/kanade/tachiyomi/extension/en/galaxydegenscans/GalaxyDegenScans.kt
new file mode 100644
index 000000000..138c9be58
--- /dev/null
+++ b/src/en/galaxydegenscans/src/eu/kanade/tachiyomi/extension/en/galaxydegenscans/GalaxyDegenScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.galaxydegenscans
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class GalaxyDegenScans : Madara("GalaxyDegenScans", "https://gdscans.com", "en")
diff --git a/src/en/girlslovemanga/build.gradle b/src/en/girlslovemanga/build.gradle
new file mode 100644
index 000000000..f2e00bfe3
--- /dev/null
+++ b/src/en/girlslovemanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Girls Love Manga!'
+ extClass = '.GirlsLoveManga'
+ themePkg = 'madara'
+ baseUrl = 'https://glmanga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/girlslovemanga/res/mipmap-hdpi/ic_launcher.png b/src/en/girlslovemanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/girlslovemanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/girlslovemanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/girlslovemanga/res/mipmap-mdpi/ic_launcher.png b/src/en/girlslovemanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/girlslovemanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/girlslovemanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/girlslovemanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/girlslovemanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/girlslovemanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/girlslovemanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/girlslovemanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/girlslovemanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/girlslovemanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/girlslovemanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/girlslovemanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/girlslovemanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/girlslovemanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/girlslovemanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/girlslovemanga/src/GirlsLoveManga.kt b/src/en/girlslovemanga/src/eu/kanade/tachiyomi/extension/en/girlslovemanga/GirlsLoveManga.kt
similarity index 100%
rename from multisrc/overrides/madara/girlslovemanga/src/GirlsLoveManga.kt
rename to src/en/girlslovemanga/src/eu/kanade/tachiyomi/extension/en/girlslovemanga/GirlsLoveManga.kt
diff --git a/src/en/globalbloging/build.gradle b/src/en/globalbloging/build.gradle
new file mode 100644
index 000000000..12e2cfa71
--- /dev/null
+++ b/src/en/globalbloging/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Global Bloging'
+ extClass = '.GlobalBloging'
+ themePkg = 'madara'
+ baseUrl = 'https://globalbloging.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/globalbloging/res/mipmap-hdpi/ic_launcher.png b/src/en/globalbloging/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/globalbloging/res/mipmap-hdpi/ic_launcher.png
rename to src/en/globalbloging/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/globalbloging/res/mipmap-mdpi/ic_launcher.png b/src/en/globalbloging/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/globalbloging/res/mipmap-mdpi/ic_launcher.png
rename to src/en/globalbloging/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/globalbloging/res/mipmap-xhdpi/ic_launcher.png b/src/en/globalbloging/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/globalbloging/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/globalbloging/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/globalbloging/res/mipmap-xxhdpi/ic_launcher.png b/src/en/globalbloging/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/globalbloging/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/globalbloging/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/globalbloging/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/globalbloging/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/globalbloging/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/globalbloging/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/globalbloging/src/GlobalBloging.kt b/src/en/globalbloging/src/eu/kanade/tachiyomi/extension/en/globalbloging/GlobalBloging.kt
similarity index 100%
rename from multisrc/overrides/madara/globalbloging/src/GlobalBloging.kt
rename to src/en/globalbloging/src/eu/kanade/tachiyomi/extension/en/globalbloging/GlobalBloging.kt
diff --git a/src/en/goodgirlsscan/build.gradle b/src/en/goodgirlsscan/build.gradle
new file mode 100644
index 000000000..d6b8fa6d4
--- /dev/null
+++ b/src/en/goodgirlsscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Good Girls Scan'
+ extClass = '.GoodGirlsScan'
+ themePkg = 'madara'
+ baseUrl = 'https://goodgirls.moe'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/goodgirlsscan/res/mipmap-hdpi/ic_launcher.png b/src/en/goodgirlsscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/goodgirlsscan/res/mipmap-hdpi/ic_launcher.png
rename to src/en/goodgirlsscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/goodgirlsscan/res/mipmap-mdpi/ic_launcher.png b/src/en/goodgirlsscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/goodgirlsscan/res/mipmap-mdpi/ic_launcher.png
rename to src/en/goodgirlsscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/goodgirlsscan/res/mipmap-xhdpi/ic_launcher.png b/src/en/goodgirlsscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/goodgirlsscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/goodgirlsscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/goodgirlsscan/res/mipmap-xxhdpi/ic_launcher.png b/src/en/goodgirlsscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/goodgirlsscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/goodgirlsscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/goodgirlsscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/goodgirlsscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/goodgirlsscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/goodgirlsscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/goodgirlsscan/src/GoodGirlsScan.kt b/src/en/goodgirlsscan/src/eu/kanade/tachiyomi/extension/en/goodgirlsscan/GoodGirlsScan.kt
similarity index 100%
rename from multisrc/overrides/madara/goodgirlsscan/src/GoodGirlsScan.kt
rename to src/en/goodgirlsscan/src/eu/kanade/tachiyomi/extension/en/goodgirlsscan/GoodGirlsScan.kt
diff --git a/src/en/gourmetscans/build.gradle b/src/en/gourmetscans/build.gradle
new file mode 100644
index 000000000..7eb2d607d
--- /dev/null
+++ b/src/en/gourmetscans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Gourmet Scans'
+ extClass = '.GourmetScans'
+ themePkg = 'madara'
+ baseUrl = 'https://gourmetsupremacy.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/gourmetscans/res/mipmap-hdpi/ic_launcher.png b/src/en/gourmetscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gourmetscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/gourmetscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gourmetscans/res/mipmap-mdpi/ic_launcher.png b/src/en/gourmetscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gourmetscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/gourmetscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gourmetscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/gourmetscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gourmetscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/gourmetscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gourmetscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/gourmetscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gourmetscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/gourmetscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gourmetscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/gourmetscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gourmetscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/gourmetscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gourmetscans/src/GourmetScans.kt b/src/en/gourmetscans/src/eu/kanade/tachiyomi/extension/en/gourmetscans/GourmetScans.kt
similarity index 100%
rename from multisrc/overrides/madara/gourmetscans/src/GourmetScans.kt
rename to src/en/gourmetscans/src/eu/kanade/tachiyomi/extension/en/gourmetscans/GourmetScans.kt
diff --git a/src/en/guya/build.gradle b/src/en/guya/build.gradle
new file mode 100644
index 000000000..56a2ce85f
--- /dev/null
+++ b/src/en/guya/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Guya'
+ extClass = '.Guya'
+ themePkg = 'guya'
+ baseUrl = 'https://guya.cubari.moe'
+ overrideVersionCode = 18
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/guya/guya/res/mipmap-hdpi/ic_launcher.png b/src/en/guya/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/guya/res/mipmap-hdpi/ic_launcher.png
rename to src/en/guya/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/guya/res/mipmap-mdpi/ic_launcher.png b/src/en/guya/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/guya/res/mipmap-mdpi/ic_launcher.png
rename to src/en/guya/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/guya/res/mipmap-xhdpi/ic_launcher.png b/src/en/guya/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/guya/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/guya/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/guya/res/mipmap-xxhdpi/ic_launcher.png b/src/en/guya/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/guya/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/guya/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/guya/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/guya/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/guya/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/guya/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/guya/src/eu/kanade/tachiyomi/extension/en/guya/Guya.kt b/src/en/guya/src/eu/kanade/tachiyomi/extension/en/guya/Guya.kt
new file mode 100644
index 000000000..63dceaa62
--- /dev/null
+++ b/src/en/guya/src/eu/kanade/tachiyomi/extension/en/guya/Guya.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.guya
+
+import eu.kanade.tachiyomi.multisrc.guya.Guya
+
+class Guya : Guya("Guya", "https://guya.cubari.moe", "en")
diff --git a/src/en/hachirumi/build.gradle b/src/en/hachirumi/build.gradle
new file mode 100644
index 000000000..5afa7f43d
--- /dev/null
+++ b/src/en/hachirumi/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hachirumi'
+ extClass = '.Hachirumi'
+ themePkg = 'guya'
+ baseUrl = 'https://hachirumi.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/guya/hachirumi/res/mipmap-hdpi/ic_launcher.png b/src/en/hachirumi/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/hachirumi/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hachirumi/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/hachirumi/res/mipmap-mdpi/ic_launcher.png b/src/en/hachirumi/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/hachirumi/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hachirumi/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/hachirumi/res/mipmap-xhdpi/ic_launcher.png b/src/en/hachirumi/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/hachirumi/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hachirumi/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/hachirumi/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hachirumi/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/hachirumi/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hachirumi/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/guya/hachirumi/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hachirumi/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/guya/hachirumi/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hachirumi/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/hachirumi/src/eu/kanade/tachiyomi/extension/en/hachirumi/Hachirumi.kt b/src/en/hachirumi/src/eu/kanade/tachiyomi/extension/en/hachirumi/Hachirumi.kt
new file mode 100644
index 000000000..6bce58453
--- /dev/null
+++ b/src/en/hachirumi/src/eu/kanade/tachiyomi/extension/en/hachirumi/Hachirumi.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.hachirumi
+
+import eu.kanade.tachiyomi.multisrc.guya.Guya
+
+class Hachirumi : Guya("Hachirumi", "https://hachirumi.com", "en")
diff --git a/src/en/hanumanscan/build.gradle b/src/en/hanumanscan/build.gradle
new file mode 100644
index 000000000..8a079f1cb
--- /dev/null
+++ b/src/en/hanumanscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Hanuman Scan'
+ extClass = '.HanumanScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://hanumanscan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/hanumanscan/res/mipmap-hdpi/ic_launcher.png b/src/en/hanumanscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hanumanscan/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hanumanscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hanumanscan/res/mipmap-mdpi/ic_launcher.png b/src/en/hanumanscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hanumanscan/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hanumanscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hanumanscan/res/mipmap-xhdpi/ic_launcher.png b/src/en/hanumanscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hanumanscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hanumanscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hanumanscan/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hanumanscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hanumanscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hanumanscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hanumanscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hanumanscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hanumanscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hanumanscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/hanumanscan/src/eu/kanade/tachiyomi/extension/en/hanumanscan/HanumanScan.kt b/src/en/hanumanscan/src/eu/kanade/tachiyomi/extension/en/hanumanscan/HanumanScan.kt
new file mode 100644
index 000000000..9df06d23f
--- /dev/null
+++ b/src/en/hanumanscan/src/eu/kanade/tachiyomi/extension/en/hanumanscan/HanumanScan.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.hanumanscan
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class HanumanScan : MangaThemesia("Hanuman Scan", "https://hanumanscan.com", "en")
diff --git a/src/en/harimanga/build.gradle b/src/en/harimanga/build.gradle
new file mode 100644
index 000000000..90e3adecf
--- /dev/null
+++ b/src/en/harimanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Harimanga'
+ extClass = '.Harimanga'
+ themePkg = 'madara'
+ baseUrl = 'https://harimanga.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/harimanga/res/mipmap-hdpi/ic_launcher.png b/src/en/harimanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/harimanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/harimanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/harimanga/res/mipmap-mdpi/ic_launcher.png b/src/en/harimanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/harimanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/harimanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/harimanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/harimanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/harimanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/harimanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/harimanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/harimanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/harimanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/harimanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/harimanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/harimanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/harimanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/harimanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/harimanga/src/Harimanga.kt b/src/en/harimanga/src/eu/kanade/tachiyomi/extension/en/harimanga/Harimanga.kt
similarity index 100%
rename from multisrc/overrides/madara/harimanga/src/Harimanga.kt
rename to src/en/harimanga/src/eu/kanade/tachiyomi/extension/en/harimanga/Harimanga.kt
diff --git a/src/en/hentai20/build.gradle b/src/en/hentai20/build.gradle
new file mode 100644
index 000000000..160d383fc
--- /dev/null
+++ b/src/en/hentai20/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hentai20'
+ extClass = '.Hentai20'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://hentai20.io'
+ overrideVersionCode = 9
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/hentai20/res/mipmap-hdpi/ic_launcher.png b/src/en/hentai20/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hentai20/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hentai20/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hentai20/res/mipmap-mdpi/ic_launcher.png b/src/en/hentai20/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hentai20/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hentai20/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hentai20/res/mipmap-xhdpi/ic_launcher.png b/src/en/hentai20/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hentai20/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hentai20/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hentai20/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hentai20/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hentai20/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hentai20/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hentai20/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hentai20/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hentai20/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hentai20/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hentai20/src/Hentai20.kt b/src/en/hentai20/src/eu/kanade/tachiyomi/extension/en/hentai20/Hentai20.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/hentai20/src/Hentai20.kt
rename to src/en/hentai20/src/eu/kanade/tachiyomi/extension/en/hentai20/Hentai20.kt
diff --git a/src/en/hentai3z/build.gradle b/src/en/hentai3z/build.gradle
new file mode 100644
index 000000000..4f259e9c3
--- /dev/null
+++ b/src/en/hentai3z/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hentai3z'
+ extClass = '.Hentai3z'
+ themePkg = 'madara'
+ baseUrl = 'https://hentai3z.xyz'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentai3z/res/mipmap-hdpi/ic_launcher.png b/src/en/hentai3z/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentai3z/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hentai3z/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentai3z/res/mipmap-mdpi/ic_launcher.png b/src/en/hentai3z/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentai3z/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hentai3z/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentai3z/res/mipmap-xhdpi/ic_launcher.png b/src/en/hentai3z/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentai3z/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hentai3z/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentai3z/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hentai3z/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentai3z/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hentai3z/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentai3z/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hentai3z/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentai3z/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hentai3z/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentai3z/src/Hentai3z.kt b/src/en/hentai3z/src/eu/kanade/tachiyomi/extension/en/hentai3z/Hentai3z.kt
similarity index 100%
rename from multisrc/overrides/madara/hentai3z/src/Hentai3z.kt
rename to src/en/hentai3z/src/eu/kanade/tachiyomi/extension/en/hentai3z/Hentai3z.kt
diff --git a/src/en/hentai3zcc/build.gradle b/src/en/hentai3zcc/build.gradle
new file mode 100644
index 000000000..6fdd50d24
--- /dev/null
+++ b/src/en/hentai3zcc/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hentai3z.CC'
+ extClass = '.Hentai3zCC'
+ themePkg = 'manga18'
+ baseUrl = 'https://hentai3z.cc'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/manga18/hentai3zcc/res/mipmap-hdpi/ic_launcher.png b/src/en/hentai3zcc/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/manga18/hentai3zcc/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hentai3zcc/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/manga18/hentai3zcc/res/mipmap-mdpi/ic_launcher.png b/src/en/hentai3zcc/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/manga18/hentai3zcc/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hentai3zcc/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/manga18/hentai3zcc/res/mipmap-xhdpi/ic_launcher.png b/src/en/hentai3zcc/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/manga18/hentai3zcc/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hentai3zcc/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/manga18/hentai3zcc/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hentai3zcc/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/manga18/hentai3zcc/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hentai3zcc/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/manga18/hentai3zcc/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hentai3zcc/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/manga18/hentai3zcc/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hentai3zcc/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/manga18/hentai3zcc/src/Hentai3zCC.kt b/src/en/hentai3zcc/src/eu/kanade/tachiyomi/extension/en/hentai3zcc/Hentai3zCC.kt
similarity index 100%
rename from multisrc/overrides/manga18/hentai3zcc/src/Hentai3zCC.kt
rename to src/en/hentai3zcc/src/eu/kanade/tachiyomi/extension/en/hentai3zcc/Hentai3zCC.kt
diff --git a/src/en/hentai4free/build.gradle b/src/en/hentai4free/build.gradle
new file mode 100644
index 000000000..b47d5c35d
--- /dev/null
+++ b/src/en/hentai4free/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hentai4Free'
+ extClass = '.Hentai4Free'
+ themePkg = 'madara'
+ baseUrl = 'https://hentai4free.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentai4free/res/mipmap-hdpi/ic_launcher.png b/src/en/hentai4free/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentai4free/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hentai4free/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentai4free/res/mipmap-mdpi/ic_launcher.png b/src/en/hentai4free/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentai4free/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hentai4free/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentai4free/res/mipmap-xhdpi/ic_launcher.png b/src/en/hentai4free/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentai4free/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hentai4free/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentai4free/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hentai4free/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentai4free/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hentai4free/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentai4free/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hentai4free/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentai4free/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hentai4free/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentai4free/src/Hentai4Free.kt b/src/en/hentai4free/src/eu/kanade/tachiyomi/extension/en/hentai4free/Hentai4Free.kt
similarity index 100%
rename from multisrc/overrides/madara/hentai4free/src/Hentai4Free.kt
rename to src/en/hentai4free/src/eu/kanade/tachiyomi/extension/en/hentai4free/Hentai4Free.kt
diff --git a/src/en/hentaimanga/build.gradle b/src/en/hentaimanga/build.gradle
new file mode 100644
index 000000000..cb0d142e0
--- /dev/null
+++ b/src/en/hentaimanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hentai Manga'
+ extClass = '.HentaiManga'
+ themePkg = 'madara'
+ baseUrl = 'https://hentaimanga.me'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentaimanga/res/mipmap-hdpi/ic_launcher.png b/src/en/hentaimanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaimanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hentaimanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaimanga/res/mipmap-mdpi/ic_launcher.png b/src/en/hentaimanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaimanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hentaimanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaimanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/hentaimanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaimanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hentaimanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaimanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hentaimanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaimanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hentaimanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaimanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hentaimanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaimanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hentaimanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaimanga/src/HentaiManga.kt b/src/en/hentaimanga/src/eu/kanade/tachiyomi/extension/en/hentaimanga/HentaiManga.kt
similarity index 100%
rename from multisrc/overrides/madara/hentaimanga/src/HentaiManga.kt
rename to src/en/hentaimanga/src/eu/kanade/tachiyomi/extension/en/hentaimanga/HentaiManga.kt
diff --git a/src/en/hentairead/build.gradle b/src/en/hentairead/build.gradle
new file mode 100644
index 000000000..5d7dc0138
--- /dev/null
+++ b/src/en/hentairead/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HentaiRead'
+ extClass = '.Hentairead'
+ themePkg = 'madara'
+ baseUrl = 'https://hentairead.com'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentairead/res/mipmap-hdpi/ic_launcher.png b/src/en/hentairead/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentairead/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hentairead/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentairead/res/mipmap-mdpi/ic_launcher.png b/src/en/hentairead/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentairead/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hentairead/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentairead/res/mipmap-xhdpi/ic_launcher.png b/src/en/hentairead/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentairead/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hentairead/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentairead/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hentairead/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentairead/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hentairead/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentairead/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hentairead/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentairead/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hentairead/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentairead/src/Hentairead.kt b/src/en/hentairead/src/eu/kanade/tachiyomi/extension/en/hentairead/Hentairead.kt
similarity index 100%
rename from multisrc/overrides/madara/hentairead/src/Hentairead.kt
rename to src/en/hentairead/src/eu/kanade/tachiyomi/extension/en/hentairead/Hentairead.kt
diff --git a/src/en/hentaiwebtoon/build.gradle b/src/en/hentaiwebtoon/build.gradle
new file mode 100644
index 000000000..559c637c8
--- /dev/null
+++ b/src/en/hentaiwebtoon/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HentaiWebtoon'
+ extClass = '.HentaiWebtoon'
+ themePkg = 'madara'
+ baseUrl = 'https://hentaiwebtoon.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-hdpi/ic_launcher.png b/src/en/hentaiwebtoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaiwebtoon/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hentaiwebtoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-mdpi/ic_launcher.png b/src/en/hentaiwebtoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaiwebtoon/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hentaiwebtoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xhdpi/ic_launcher.png b/src/en/hentaiwebtoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hentaiwebtoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hentaiwebtoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hentaiwebtoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hentaiwebtoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaiwebtoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hentaiwebtoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt b/src/en/hentaiwebtoon/src/eu/kanade/tachiyomi/extension/en/hentaiwebtoon/HentaiWebtoon.kt
similarity index 100%
rename from multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt
rename to src/en/hentaiwebtoon/src/eu/kanade/tachiyomi/extension/en/hentaiwebtoon/HentaiWebtoon.kt
diff --git a/src/en/hentaixcomic/build.gradle b/src/en/hentaixcomic/build.gradle
new file mode 100644
index 000000000..020279c70
--- /dev/null
+++ b/src/en/hentaixcomic/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HentaiXComic'
+ extClass = '.HentaiXComic'
+ themePkg = 'madara'
+ baseUrl = 'https://hentaixcomic.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentaixcomic/res/mipmap-hdpi/ic_launcher.png b/src/en/hentaixcomic/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixcomic/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hentaixcomic/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixcomic/res/mipmap-mdpi/ic_launcher.png b/src/en/hentaixcomic/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixcomic/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hentaixcomic/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixcomic/res/mipmap-xhdpi/ic_launcher.png b/src/en/hentaixcomic/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixcomic/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hentaixcomic/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixcomic/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hentaixcomic/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixcomic/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hentaixcomic/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixcomic/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hentaixcomic/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixcomic/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hentaixcomic/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixcomic/src/HentaiXComic.kt b/src/en/hentaixcomic/src/eu/kanade/tachiyomi/extension/en/hentaixcomic/HentaiXComic.kt
similarity index 100%
rename from multisrc/overrides/madara/hentaixcomic/src/HentaiXComic.kt
rename to src/en/hentaixcomic/src/eu/kanade/tachiyomi/extension/en/hentaixcomic/HentaiXComic.kt
diff --git a/src/en/hentaixdickgirl/build.gradle b/src/en/hentaixdickgirl/build.gradle
new file mode 100644
index 000000000..64781c5fb
--- /dev/null
+++ b/src/en/hentaixdickgirl/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HentaiXDickgirl'
+ extClass = '.HentaiXDickgirl'
+ themePkg = 'madara'
+ baseUrl = 'https://hentaixdickgirl.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentaixdickgirl/res/mipmap-hdpi/ic_launcher.png b/src/en/hentaixdickgirl/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixdickgirl/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hentaixdickgirl/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixdickgirl/res/mipmap-mdpi/ic_launcher.png b/src/en/hentaixdickgirl/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixdickgirl/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hentaixdickgirl/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixdickgirl/res/mipmap-xhdpi/ic_launcher.png b/src/en/hentaixdickgirl/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixdickgirl/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hentaixdickgirl/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixdickgirl/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hentaixdickgirl/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixdickgirl/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hentaixdickgirl/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixdickgirl/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hentaixdickgirl/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixdickgirl/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hentaixdickgirl/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixdickgirl/src/HentaiXDickgirl.kt b/src/en/hentaixdickgirl/src/eu/kanade/tachiyomi/extension/en/hentaixdickgirl/HentaiXDickgirl.kt
similarity index 100%
rename from multisrc/overrides/madara/hentaixdickgirl/src/HentaiXDickgirl.kt
rename to src/en/hentaixdickgirl/src/eu/kanade/tachiyomi/extension/en/hentaixdickgirl/HentaiXDickgirl.kt
diff --git a/src/en/hentaixyuri/build.gradle b/src/en/hentaixyuri/build.gradle
new file mode 100644
index 000000000..e1e7181b1
--- /dev/null
+++ b/src/en/hentaixyuri/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HentaiXYuri'
+ extClass = '.HentaiXYuri'
+ themePkg = 'madara'
+ baseUrl = 'https://hentaixyuri.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentaixyuri/res/mipmap-hdpi/ic_launcher.png b/src/en/hentaixyuri/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixyuri/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hentaixyuri/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixyuri/res/mipmap-mdpi/ic_launcher.png b/src/en/hentaixyuri/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixyuri/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hentaixyuri/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixyuri/res/mipmap-xhdpi/ic_launcher.png b/src/en/hentaixyuri/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixyuri/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hentaixyuri/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixyuri/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hentaixyuri/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixyuri/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hentaixyuri/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixyuri/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hentaixyuri/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaixyuri/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hentaixyuri/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaixyuri/src/HentaiXYuri.kt b/src/en/hentaixyuri/src/eu/kanade/tachiyomi/extension/en/hentaixyuri/HentaiXYuri.kt
similarity index 100%
rename from multisrc/overrides/madara/hentaixyuri/src/HentaiXYuri.kt
rename to src/en/hentaixyuri/src/eu/kanade/tachiyomi/extension/en/hentaixyuri/HentaiXYuri.kt
diff --git a/src/en/hiperdex/build.gradle b/src/en/hiperdex/build.gradle
new file mode 100644
index 000000000..1ef2f29e3
--- /dev/null
+++ b/src/en/hiperdex/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hiperdex'
+ extClass = '.Hiperdex'
+ themePkg = 'madara'
+ baseUrl = 'https://hiperdex.com'
+ overrideVersionCode = 11
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hiperdex/res/mipmap-hdpi/ic_launcher.png b/src/en/hiperdex/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hiperdex/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hiperdex/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hiperdex/res/mipmap-mdpi/ic_launcher.png b/src/en/hiperdex/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hiperdex/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hiperdex/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hiperdex/res/mipmap-xhdpi/ic_launcher.png b/src/en/hiperdex/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hiperdex/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hiperdex/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hiperdex/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hiperdex/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hiperdex/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hiperdex/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hiperdex/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hiperdex/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hiperdex/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hiperdex/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hiperdex/src/Hiperdex.kt b/src/en/hiperdex/src/eu/kanade/tachiyomi/extension/en/hiperdex/Hiperdex.kt
similarity index 100%
rename from multisrc/overrides/madara/hiperdex/src/Hiperdex.kt
rename to src/en/hiperdex/src/eu/kanade/tachiyomi/extension/en/hiperdex/Hiperdex.kt
diff --git a/src/en/hm2d/build.gradle b/src/en/hm2d/build.gradle
new file mode 100644
index 000000000..90fed982b
--- /dev/null
+++ b/src/en/hm2d/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HM2D'
+ extClass = '.HM2D'
+ themePkg = 'madara'
+ baseUrl = 'https://mangadistrict.com/hdoujin'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hm2d/res/mipmap-hdpi/ic_launcher.png b/src/en/hm2d/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hm2d/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hm2d/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hm2d/res/mipmap-mdpi/ic_launcher.png b/src/en/hm2d/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hm2d/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hm2d/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hm2d/res/mipmap-xhdpi/ic_launcher.png b/src/en/hm2d/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hm2d/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hm2d/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hm2d/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hm2d/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hm2d/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hm2d/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hm2d/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hm2d/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hm2d/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hm2d/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hm2d/src/HM2D.kt b/src/en/hm2d/src/eu/kanade/tachiyomi/extension/en/hm2d/HM2D.kt
similarity index 100%
rename from multisrc/overrides/madara/hm2d/src/HM2D.kt
rename to src/en/hm2d/src/eu/kanade/tachiyomi/extension/en/hm2d/HM2D.kt
diff --git a/src/en/holymanga/build.gradle b/src/en/holymanga/build.gradle
new file mode 100644
index 000000000..d4487c5d4
--- /dev/null
+++ b/src/en/holymanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HolyManga'
+ extClass = '.HolyManga'
+ themePkg = 'zbulu'
+ baseUrl = 'https://w30.holymanga.net'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zbulu/holymanga/res/mipmap-hdpi/ic_launcher.png b/src/en/holymanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/holymanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/holymanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zbulu/holymanga/res/mipmap-mdpi/ic_launcher.png b/src/en/holymanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/holymanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/holymanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zbulu/holymanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/holymanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/holymanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/holymanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zbulu/holymanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/holymanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/holymanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/holymanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zbulu/holymanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/holymanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/holymanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/holymanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/holymanga/src/eu/kanade/tachiyomi/extension/en/holymanga/HolyManga.kt b/src/en/holymanga/src/eu/kanade/tachiyomi/extension/en/holymanga/HolyManga.kt
new file mode 100644
index 000000000..6c40522c4
--- /dev/null
+++ b/src/en/holymanga/src/eu/kanade/tachiyomi/extension/en/holymanga/HolyManga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.holymanga
+
+import eu.kanade.tachiyomi.multisrc.zbulu.Zbulu
+
+class HolyManga : Zbulu("HolyManga", "https://w30.holymanga.net", "en")
diff --git a/src/en/hreads/build.gradle b/src/en/hreads/build.gradle
new file mode 100644
index 000000000..3067b58f2
--- /dev/null
+++ b/src/en/hreads/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hreads'
+ extClass = '.Hreads'
+ themePkg = 'madara'
+ baseUrl = 'https://hreads.net'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hreads/res/mipmap-hdpi/ic_launcher.png b/src/en/hreads/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hreads/res/mipmap-hdpi/ic_launcher.png
rename to src/en/hreads/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hreads/res/mipmap-mdpi/ic_launcher.png b/src/en/hreads/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hreads/res/mipmap-mdpi/ic_launcher.png
rename to src/en/hreads/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hreads/res/mipmap-xhdpi/ic_launcher.png b/src/en/hreads/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hreads/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/hreads/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hreads/res/mipmap-xxhdpi/ic_launcher.png b/src/en/hreads/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hreads/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/hreads/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hreads/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/hreads/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hreads/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/hreads/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/hreads/src/eu/kanade/tachiyomi/extension/en/hreads/Hreads.kt b/src/en/hreads/src/eu/kanade/tachiyomi/extension/en/hreads/Hreads.kt
new file mode 100644
index 000000000..f57b4f275
--- /dev/null
+++ b/src/en/hreads/src/eu/kanade/tachiyomi/extension/en/hreads/Hreads.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.hreads
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Hreads : Madara("Hreads", "https://hreads.net", "en")
diff --git a/src/en/ilovemanhwa/build.gradle b/src/en/ilovemanhwa/build.gradle
new file mode 100644
index 000000000..00187860d
--- /dev/null
+++ b/src/en/ilovemanhwa/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'I Love Manhwa'
+ extClass = '.ILoveManhwa'
+ themePkg = 'madara'
+ baseUrl = 'https://ilovemanhwa.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/ilovemanhwa/res/mipmap-hdpi/ic_launcher.png b/src/en/ilovemanhwa/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ilovemanhwa/res/mipmap-hdpi/ic_launcher.png
rename to src/en/ilovemanhwa/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ilovemanhwa/res/mipmap-mdpi/ic_launcher.png b/src/en/ilovemanhwa/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ilovemanhwa/res/mipmap-mdpi/ic_launcher.png
rename to src/en/ilovemanhwa/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ilovemanhwa/res/mipmap-xhdpi/ic_launcher.png b/src/en/ilovemanhwa/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ilovemanhwa/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/ilovemanhwa/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ilovemanhwa/res/mipmap-xxhdpi/ic_launcher.png b/src/en/ilovemanhwa/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ilovemanhwa/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/ilovemanhwa/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ilovemanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/ilovemanhwa/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ilovemanhwa/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/ilovemanhwa/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/ilovemanhwa/src/eu/kanade/tachiyomi/extension/en/ilovemanhwa/ILoveManhwa.kt b/src/en/ilovemanhwa/src/eu/kanade/tachiyomi/extension/en/ilovemanhwa/ILoveManhwa.kt
new file mode 100644
index 000000000..901e149af
--- /dev/null
+++ b/src/en/ilovemanhwa/src/eu/kanade/tachiyomi/extension/en/ilovemanhwa/ILoveManhwa.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.ilovemanhwa
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class ILoveManhwa : Madara("I Love Manhwa", "https://ilovemanhwa.com", "en")
diff --git a/src/en/immortalupdates/build.gradle b/src/en/immortalupdates/build.gradle
new file mode 100644
index 000000000..5dd577af1
--- /dev/null
+++ b/src/en/immortalupdates/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Immortal Updates'
+ extClass = '.ImmortalUpdates'
+ themePkg = 'madara'
+ baseUrl = 'https://immortalupdates.com'
+ overrideVersionCode = 6
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/immortalupdates/res/mipmap-hdpi/ic_launcher.png b/src/en/immortalupdates/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/immortalupdates/res/mipmap-hdpi/ic_launcher.png
rename to src/en/immortalupdates/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/immortalupdates/res/mipmap-mdpi/ic_launcher.png b/src/en/immortalupdates/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/immortalupdates/res/mipmap-mdpi/ic_launcher.png
rename to src/en/immortalupdates/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/immortalupdates/res/mipmap-xhdpi/ic_launcher.png b/src/en/immortalupdates/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/immortalupdates/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/immortalupdates/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/immortalupdates/res/mipmap-xxhdpi/ic_launcher.png b/src/en/immortalupdates/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/immortalupdates/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/immortalupdates/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/immortalupdates/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/immortalupdates/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/immortalupdates/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/immortalupdates/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/immortalupdates/src/ImmortalUpdates.kt b/src/en/immortalupdates/src/eu/kanade/tachiyomi/extension/en/immortalupdates/ImmortalUpdates.kt
similarity index 100%
rename from multisrc/overrides/madara/immortalupdates/src/ImmortalUpdates.kt
rename to src/en/immortalupdates/src/eu/kanade/tachiyomi/extension/en/immortalupdates/ImmortalUpdates.kt
diff --git a/src/en/infernalvoidscans/build.gradle b/src/en/infernalvoidscans/build.gradle
new file mode 100644
index 000000000..ed97683fa
--- /dev/null
+++ b/src/en/infernalvoidscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Infernal Void Scans'
+ extClass = '.InfernalVoidScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://void-scans.com'
+ overrideVersionCode = 5
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/infernalvoidscans/res/mipmap-hdpi/ic_launcher.png b/src/en/infernalvoidscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/infernalvoidscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/infernalvoidscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/infernalvoidscans/res/mipmap-mdpi/ic_launcher.png b/src/en/infernalvoidscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/infernalvoidscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/infernalvoidscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/infernalvoidscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/infernalvoidscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/infernalvoidscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/infernalvoidscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/infernalvoidscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/infernalvoidscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/infernalvoidscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/infernalvoidscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/infernalvoidscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/infernalvoidscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/infernalvoidscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/infernalvoidscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/infernalvoidscans/src/InfernalVoidScans.kt b/src/en/infernalvoidscans/src/eu/kanade/tachiyomi/extension/en/infernalvoidscans/InfernalVoidScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/infernalvoidscans/src/InfernalVoidScans.kt
rename to src/en/infernalvoidscans/src/eu/kanade/tachiyomi/extension/en/infernalvoidscans/InfernalVoidScans.kt
diff --git a/src/en/instamanhwa/build.gradle b/src/en/instamanhwa/build.gradle
new file mode 100644
index 000000000..4ab1b815d
--- /dev/null
+++ b/src/en/instamanhwa/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'InstaManhwa'
+ extClass = '.InstaManhwa'
+ themePkg = 'madara'
+ baseUrl = 'https://www.instamanhwa.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/instamanhwa/res/mipmap-hdpi/ic_launcher.png b/src/en/instamanhwa/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/instamanhwa/res/mipmap-hdpi/ic_launcher.png
rename to src/en/instamanhwa/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/instamanhwa/res/mipmap-mdpi/ic_launcher.png b/src/en/instamanhwa/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/instamanhwa/res/mipmap-mdpi/ic_launcher.png
rename to src/en/instamanhwa/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/instamanhwa/res/mipmap-xhdpi/ic_launcher.png b/src/en/instamanhwa/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/instamanhwa/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/instamanhwa/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/instamanhwa/res/mipmap-xxhdpi/ic_launcher.png b/src/en/instamanhwa/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/instamanhwa/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/instamanhwa/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/instamanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/instamanhwa/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/instamanhwa/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/instamanhwa/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/instamanhwa/src/InstaManhwa.kt b/src/en/instamanhwa/src/eu/kanade/tachiyomi/extension/en/instamanhwa/InstaManhwa.kt
similarity index 100%
rename from multisrc/overrides/madara/instamanhwa/src/InstaManhwa.kt
rename to src/en/instamanhwa/src/eu/kanade/tachiyomi/extension/en/instamanhwa/InstaManhwa.kt
diff --git a/src/en/isekaiscaneu/build.gradle b/src/en/isekaiscaneu/build.gradle
new file mode 100644
index 000000000..b2a6184e3
--- /dev/null
+++ b/src/en/isekaiscaneu/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'IsekaiScan.to (unoriginal)'
+ extClass = '.IsekaiScanTo'
+ themePkg = 'madara'
+ baseUrl = 'https://m.isekaiscan.to'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/isekaiscaneu/res/mipmap-hdpi/ic_launcher.png b/src/en/isekaiscaneu/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscaneu/res/mipmap-hdpi/ic_launcher.png
rename to src/en/isekaiscaneu/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscaneu/res/mipmap-mdpi/ic_launcher.png b/src/en/isekaiscaneu/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscaneu/res/mipmap-mdpi/ic_launcher.png
rename to src/en/isekaiscaneu/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscaneu/res/mipmap-xhdpi/ic_launcher.png b/src/en/isekaiscaneu/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscaneu/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/isekaiscaneu/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscaneu/res/mipmap-xxhdpi/ic_launcher.png b/src/en/isekaiscaneu/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscaneu/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/isekaiscaneu/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscaneu/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/isekaiscaneu/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscaneu/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/isekaiscaneu/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscaneu/src/IsekaiScanTo.kt b/src/en/isekaiscaneu/src/eu/kanade/tachiyomi/extension/en/isekaiscaneu/IsekaiScanTo.kt
similarity index 100%
rename from multisrc/overrides/madara/isekaiscaneu/src/IsekaiScanTo.kt
rename to src/en/isekaiscaneu/src/eu/kanade/tachiyomi/extension/en/isekaiscaneu/IsekaiScanTo.kt
diff --git a/src/en/isekaiscanmanga/build.gradle b/src/en/isekaiscanmanga/build.gradle
new file mode 100644
index 000000000..b58b18f93
--- /dev/null
+++ b/src/en/isekaiscanmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'IsekaiScanManga (unoriginal)'
+ extClass = '.IsekaiScanManga'
+ themePkg = 'madara'
+ baseUrl = 'https://isekaiscanmanga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/isekaiscanmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/isekaiscanmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscanmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/isekaiscanmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscanmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/isekaiscanmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscanmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/isekaiscanmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscanmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/isekaiscanmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscanmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/isekaiscanmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscanmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/isekaiscanmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscanmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/isekaiscanmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscanmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/isekaiscanmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscanmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/isekaiscanmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscanmanga/src/IsekaiScanManga.kt b/src/en/isekaiscanmanga/src/eu/kanade/tachiyomi/extension/en/isekaiscanmanga/IsekaiScanManga.kt
similarity index 100%
rename from multisrc/overrides/madara/isekaiscanmanga/src/IsekaiScanManga.kt
rename to src/en/isekaiscanmanga/src/eu/kanade/tachiyomi/extension/en/isekaiscanmanga/IsekaiScanManga.kt
diff --git a/src/en/isekaiscantop/build.gradle b/src/en/isekaiscantop/build.gradle
new file mode 100644
index 000000000..725f1b829
--- /dev/null
+++ b/src/en/isekaiscantop/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'IsekaiScan.top (unoriginal)'
+ extClass = '.IsekaiScanTop'
+ themePkg = 'madara'
+ baseUrl = 'https://isekaiscan.top'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/isekaiscantop/res/mipmap-hdpi/ic_launcher.png b/src/en/isekaiscantop/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscantop/res/mipmap-hdpi/ic_launcher.png
rename to src/en/isekaiscantop/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscantop/res/mipmap-mdpi/ic_launcher.png b/src/en/isekaiscantop/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscantop/res/mipmap-mdpi/ic_launcher.png
rename to src/en/isekaiscantop/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscantop/res/mipmap-xhdpi/ic_launcher.png b/src/en/isekaiscantop/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscantop/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/isekaiscantop/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscantop/res/mipmap-xxhdpi/ic_launcher.png b/src/en/isekaiscantop/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscantop/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/isekaiscantop/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscantop/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/isekaiscantop/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/isekaiscantop/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/isekaiscantop/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/isekaiscantop/src/IsekaiScanTop.kt b/src/en/isekaiscantop/src/eu/kanade/tachiyomi/extension/en/isekaiscantop/IsekaiScanTop.kt
similarity index 100%
rename from multisrc/overrides/madara/isekaiscantop/src/IsekaiScanTop.kt
rename to src/en/isekaiscantop/src/eu/kanade/tachiyomi/extension/en/isekaiscantop/IsekaiScanTop.kt
diff --git a/src/en/itsyourrightmanhua/build.gradle b/src/en/itsyourrightmanhua/build.gradle
new file mode 100644
index 000000000..3ab0c0135
--- /dev/null
+++ b/src/en/itsyourrightmanhua/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Its Your Right Manhua'
+ extClass = '.ItsYourRightManhua'
+ themePkg = 'madara'
+ baseUrl = 'https://itsyourightmanhua.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/itsyourrightmanhua/res/mipmap-hdpi/ic_launcher.png b/src/en/itsyourrightmanhua/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/itsyourrightmanhua/res/mipmap-hdpi/ic_launcher.png
rename to src/en/itsyourrightmanhua/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/itsyourrightmanhua/res/mipmap-mdpi/ic_launcher.png b/src/en/itsyourrightmanhua/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/itsyourrightmanhua/res/mipmap-mdpi/ic_launcher.png
rename to src/en/itsyourrightmanhua/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/itsyourrightmanhua/res/mipmap-xhdpi/ic_launcher.png b/src/en/itsyourrightmanhua/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/itsyourrightmanhua/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/itsyourrightmanhua/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/itsyourrightmanhua/res/mipmap-xxhdpi/ic_launcher.png b/src/en/itsyourrightmanhua/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/itsyourrightmanhua/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/itsyourrightmanhua/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/itsyourrightmanhua/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/itsyourrightmanhua/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/itsyourrightmanhua/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/itsyourrightmanhua/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/itsyourrightmanhua/src/ItsYourRightManhua.kt b/src/en/itsyourrightmanhua/src/eu/kanade/tachiyomi/extension/en/itsyourrightmanhua/ItsYourRightManhua.kt
similarity index 100%
rename from multisrc/overrides/madara/itsyourrightmanhua/src/ItsYourRightManhua.kt
rename to src/en/itsyourrightmanhua/src/eu/kanade/tachiyomi/extension/en/itsyourrightmanhua/ItsYourRightManhua.kt
diff --git a/src/en/jimanga/build.gradle b/src/en/jimanga/build.gradle
new file mode 100644
index 000000000..f94879519
--- /dev/null
+++ b/src/en/jimanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Jimanga'
+ extClass = '.Jimanga'
+ themePkg = 'madara'
+ baseUrl = 'https://jimanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/jimanga/src/Jimanga.kt b/src/en/jimanga/src/eu/kanade/tachiyomi/extension/en/jimanga/Jimanga.kt
similarity index 100%
rename from multisrc/overrides/madara/jimanga/src/Jimanga.kt
rename to src/en/jimanga/src/eu/kanade/tachiyomi/extension/en/jimanga/Jimanga.kt
diff --git a/src/en/kaiscans/build.gradle b/src/en/kaiscans/build.gradle
new file mode 100644
index 000000000..2fa55c12d
--- /dev/null
+++ b/src/en/kaiscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Kai Scans'
+ extClass = '.KaiScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://kaiscans.org'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/kaiscans/res/mipmap-hdpi/ic_launcher.png b/src/en/kaiscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kaiscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/kaiscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kaiscans/res/mipmap-mdpi/ic_launcher.png b/src/en/kaiscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kaiscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/kaiscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kaiscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/kaiscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kaiscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/kaiscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kaiscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/kaiscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kaiscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/kaiscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kaiscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/kaiscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kaiscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/kaiscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kaiscans/src/KaiScans.kt b/src/en/kaiscans/src/eu/kanade/tachiyomi/extension/en/kaiscans/KaiScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/kaiscans/src/KaiScans.kt
rename to src/en/kaiscans/src/eu/kanade/tachiyomi/extension/en/kaiscans/KaiScans.kt
diff --git a/src/en/kissmangain/build.gradle b/src/en/kissmangain/build.gradle
new file mode 100644
index 000000000..2785fde76
--- /dev/null
+++ b/src/en/kissmangain/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Kissmanga.in'
+ extClass = '.KissmangaIn'
+ themePkg = 'madara'
+ baseUrl = 'https://kissmanga.in'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/kissmangain/res/mipmap-hdpi/ic_launcher.png b/src/en/kissmangain/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kissmangain/res/mipmap-hdpi/ic_launcher.png
rename to src/en/kissmangain/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kissmangain/res/mipmap-mdpi/ic_launcher.png b/src/en/kissmangain/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kissmangain/res/mipmap-mdpi/ic_launcher.png
rename to src/en/kissmangain/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kissmangain/res/mipmap-xhdpi/ic_launcher.png b/src/en/kissmangain/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kissmangain/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/kissmangain/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kissmangain/res/mipmap-xxhdpi/ic_launcher.png b/src/en/kissmangain/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kissmangain/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/kissmangain/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kissmangain/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/kissmangain/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kissmangain/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/kissmangain/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kissmangain/src/KissmangaIn.kt b/src/en/kissmangain/src/eu/kanade/tachiyomi/extension/en/kissmangain/KissmangaIn.kt
similarity index 100%
rename from multisrc/overrides/madara/kissmangain/src/KissmangaIn.kt
rename to src/en/kissmangain/src/eu/kanade/tachiyomi/extension/en/kissmangain/KissmangaIn.kt
diff --git a/src/en/komikchan/build.gradle b/src/en/komikchan/build.gradle
new file mode 100644
index 000000000..492e5d62b
--- /dev/null
+++ b/src/en/komikchan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Komik Chan'
+ extClass = '.KomikChan'
+ themePkg = 'madara'
+ baseUrl = 'https://komikchan.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/komikchan/res/mipmap-hdpi/ic_launcher.png b/src/en/komikchan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/komikchan/res/mipmap-hdpi/ic_launcher.png
rename to src/en/komikchan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/komikchan/res/mipmap-mdpi/ic_launcher.png b/src/en/komikchan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/komikchan/res/mipmap-mdpi/ic_launcher.png
rename to src/en/komikchan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/komikchan/res/mipmap-xhdpi/ic_launcher.png b/src/en/komikchan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/komikchan/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/komikchan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/komikchan/res/mipmap-xxhdpi/ic_launcher.png b/src/en/komikchan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/komikchan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/komikchan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/komikchan/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/komikchan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/komikchan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/komikchan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/komikchan/src/KomikChan.kt b/src/en/komikchan/src/eu/kanade/tachiyomi/extension/en/komikchan/KomikChan.kt
similarity index 100%
rename from multisrc/overrides/madara/komikchan/src/KomikChan.kt
rename to src/en/komikchan/src/eu/kanade/tachiyomi/extension/en/komikchan/KomikChan.kt
diff --git a/src/en/komiklab/build.gradle b/src/en/komiklab/build.gradle
new file mode 100644
index 000000000..c399a5920
--- /dev/null
+++ b/src/en/komiklab/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Komik Lab'
+ extClass = '.KomikLab'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://komiklab.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/komiklab/res/mipmap-hdpi/ic_launcher.png b/src/en/komiklab/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiklab/res/mipmap-hdpi/ic_launcher.png
rename to src/en/komiklab/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiklab/res/mipmap-mdpi/ic_launcher.png b/src/en/komiklab/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiklab/res/mipmap-mdpi/ic_launcher.png
rename to src/en/komiklab/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiklab/res/mipmap-xhdpi/ic_launcher.png b/src/en/komiklab/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiklab/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/komiklab/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiklab/res/mipmap-xxhdpi/ic_launcher.png b/src/en/komiklab/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiklab/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/komiklab/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiklab/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/komiklab/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiklab/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/komiklab/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/komiklab/src/eu/kanade/tachiyomi/extension/en/komiklab/KomikLab.kt b/src/en/komiklab/src/eu/kanade/tachiyomi/extension/en/komiklab/KomikLab.kt
new file mode 100644
index 000000000..71d3cf467
--- /dev/null
+++ b/src/en/komiklab/src/eu/kanade/tachiyomi/extension/en/komiklab/KomikLab.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.komiklab
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class KomikLab : MangaThemesia("Komik Lab", "https://komiklab.com", "en")
diff --git a/src/en/ksgroupscans/build.gradle b/src/en/ksgroupscans/build.gradle
new file mode 100644
index 000000000..a507536ee
--- /dev/null
+++ b/src/en/ksgroupscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'KSGroupScans'
+ extClass = '.KSGroupScans'
+ themePkg = 'madara'
+ baseUrl = 'https://ksgroupscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/ksgroupscans/res/mipmap-hdpi/ic_launcher.png b/src/en/ksgroupscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ksgroupscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/ksgroupscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ksgroupscans/res/mipmap-mdpi/ic_launcher.png b/src/en/ksgroupscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ksgroupscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/ksgroupscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ksgroupscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/ksgroupscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ksgroupscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/ksgroupscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ksgroupscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/ksgroupscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ksgroupscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/ksgroupscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ksgroupscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/ksgroupscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ksgroupscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/ksgroupscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ksgroupscans/src/KSGroupScans.kt b/src/en/ksgroupscans/src/eu/kanade/tachiyomi/extension/en/ksgroupscans/KSGroupScans.kt
similarity index 100%
rename from multisrc/overrides/madara/ksgroupscans/src/KSGroupScans.kt
rename to src/en/ksgroupscans/src/eu/kanade/tachiyomi/extension/en/ksgroupscans/KSGroupScans.kt
diff --git a/src/en/kumascans/build.gradle b/src/en/kumascans/build.gradle
new file mode 100644
index 000000000..1a15a135c
--- /dev/null
+++ b/src/en/kumascans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Kuma Scans (Kuma Translation)'
+ extClass = '.KumaScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://kumascans.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/kumascans/res/mipmap-hdpi/ic_launcher.png b/src/en/kumascans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kumascans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/kumascans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kumascans/res/mipmap-mdpi/ic_launcher.png b/src/en/kumascans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kumascans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/kumascans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kumascans/res/mipmap-xhdpi/ic_launcher.png b/src/en/kumascans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kumascans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/kumascans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kumascans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/kumascans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kumascans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/kumascans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kumascans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/kumascans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kumascans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/kumascans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kumascans/src/KumaScans.kt b/src/en/kumascans/src/eu/kanade/tachiyomi/extension/en/kumascans/KumaScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/kumascans/src/KumaScans.kt
rename to src/en/kumascans/src/eu/kanade/tachiyomi/extension/en/kumascans/KumaScans.kt
diff --git a/src/en/kunmanga/build.gradle b/src/en/kunmanga/build.gradle
new file mode 100644
index 000000000..ef3107090
--- /dev/null
+++ b/src/en/kunmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Kun Manga'
+ extClass = '.KunManga'
+ themePkg = 'madara'
+ baseUrl = 'https://kunmanga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/kunmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/kunmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kunmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/kunmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kunmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/kunmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kunmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/kunmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kunmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/kunmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kunmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/kunmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kunmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/kunmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kunmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/kunmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kunmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/kunmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kunmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/kunmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/kunmanga/src/eu/kanade/tachiyomi/extension/en/kunmanga/KunManga.kt b/src/en/kunmanga/src/eu/kanade/tachiyomi/extension/en/kunmanga/KunManga.kt
new file mode 100644
index 000000000..af0222bc5
--- /dev/null
+++ b/src/en/kunmanga/src/eu/kanade/tachiyomi/extension/en/kunmanga/KunManga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.kunmanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class KunManga : Madara("Kun Manga", "https://kunmanga.com", "en")
diff --git a/src/en/ladymanga/build.gradle b/src/en/ladymanga/build.gradle
new file mode 100644
index 000000000..1104f694c
--- /dev/null
+++ b/src/en/ladymanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Lady Manga'
+ extClass = '.LadyManga'
+ themePkg = 'madara'
+ baseUrl = 'https://ladymanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/ladymanga/src/eu/kanade/tachiyomi/extension/en/ladymanga/LadyManga.kt b/src/en/ladymanga/src/eu/kanade/tachiyomi/extension/en/ladymanga/LadyManga.kt
new file mode 100644
index 000000000..5f993dfbc
--- /dev/null
+++ b/src/en/ladymanga/src/eu/kanade/tachiyomi/extension/en/ladymanga/LadyManga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.ladymanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class LadyManga : Madara("Lady Manga", "https://ladymanga.com", "en")
diff --git a/src/en/lalamanga/build.gradle b/src/en/lalamanga/build.gradle
new file mode 100644
index 000000000..d57eb0adf
--- /dev/null
+++ b/src/en/lalamanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Lala Manga'
+ extClass = '.LalaManga'
+ themePkg = 'madara'
+ baseUrl = 'https://lalamanga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/lalamanga/res/mipmap-hdpi/ic_launcher.png b/src/en/lalamanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lalamanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/lalamanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lalamanga/res/mipmap-mdpi/ic_launcher.png b/src/en/lalamanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lalamanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/lalamanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lalamanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/lalamanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lalamanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/lalamanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lalamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/lalamanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lalamanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/lalamanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lalamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/lalamanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lalamanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/lalamanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/lalamanga/src/eu/kanade/tachiyomi/extension/en/lalamanga/LalaManga.kt b/src/en/lalamanga/src/eu/kanade/tachiyomi/extension/en/lalamanga/LalaManga.kt
new file mode 100644
index 000000000..a8064d7e6
--- /dev/null
+++ b/src/en/lalamanga/src/eu/kanade/tachiyomi/extension/en/lalamanga/LalaManga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.lalamanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class LalaManga : Madara("Lala Manga", "https://lalamanga.com", "en")
diff --git a/src/en/leviatanscans/build.gradle b/src/en/leviatanscans/build.gradle
new file mode 100644
index 000000000..7af8037d6
--- /dev/null
+++ b/src/en/leviatanscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Leviatan Scans'
+ extClass = '.LeviatanScans'
+ themePkg = 'madara'
+ baseUrl = 'https://lscomic.com'
+ overrideVersionCode = 15
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/leviatanscans/res/mipmap-hdpi/ic_launcher.png b/src/en/leviatanscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/leviatanscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/leviatanscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/leviatanscans/res/mipmap-mdpi/ic_launcher.png b/src/en/leviatanscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/leviatanscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/leviatanscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/leviatanscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/leviatanscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/leviatanscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/leviatanscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/leviatanscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/leviatanscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/leviatanscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/leviatanscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/leviatanscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/leviatanscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/leviatanscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/leviatanscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/leviatanscans/src/LeviatanScans.kt b/src/en/leviatanscans/src/eu/kanade/tachiyomi/extension/en/leviatanscans/LeviatanScans.kt
similarity index 100%
rename from multisrc/overrides/madara/leviatanscans/src/LeviatanScans.kt
rename to src/en/leviatanscans/src/eu/kanade/tachiyomi/extension/en/leviatanscans/LeviatanScans.kt
diff --git a/src/en/lhtranslation/build.gradle b/src/en/lhtranslation/build.gradle
new file mode 100644
index 000000000..5d891c0f7
--- /dev/null
+++ b/src/en/lhtranslation/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'LHTranslation'
+ extClass = '.LHTranslation'
+ themePkg = 'madara'
+ baseUrl = 'https://lhtranslation.net'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/lhtranslation/res/mipmap-hdpi/ic_launcher.png b/src/en/lhtranslation/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lhtranslation/res/mipmap-hdpi/ic_launcher.png
rename to src/en/lhtranslation/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lhtranslation/res/mipmap-mdpi/ic_launcher.png b/src/en/lhtranslation/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lhtranslation/res/mipmap-mdpi/ic_launcher.png
rename to src/en/lhtranslation/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lhtranslation/res/mipmap-xhdpi/ic_launcher.png b/src/en/lhtranslation/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lhtranslation/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/lhtranslation/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lhtranslation/res/mipmap-xxhdpi/ic_launcher.png b/src/en/lhtranslation/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lhtranslation/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/lhtranslation/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lhtranslation/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/lhtranslation/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lhtranslation/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/lhtranslation/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lhtranslation/src/LHTranslation.kt b/src/en/lhtranslation/src/eu/kanade/tachiyomi/extension/en/lhtranslation/LHTranslation.kt
similarity index 100%
rename from multisrc/overrides/madara/lhtranslation/src/LHTranslation.kt
rename to src/en/lhtranslation/src/eu/kanade/tachiyomi/extension/en/lhtranslation/LHTranslation.kt
diff --git a/src/en/likemanga/build.gradle b/src/en/likemanga/build.gradle
new file mode 100644
index 000000000..14f4ef1e5
--- /dev/null
+++ b/src/en/likemanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'LikeManga'
+ extClass = '.LikeMangaIO'
+ themePkg = 'likemanga'
+ baseUrl = 'https://likemanga.io'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/likemanga/likemanga/res/mipmap-hdpi/ic_launcher.png b/src/en/likemanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/likemanga/likemanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/likemanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/likemanga/likemanga/res/mipmap-mdpi/ic_launcher.png b/src/en/likemanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/likemanga/likemanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/likemanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/likemanga/likemanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/likemanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/likemanga/likemanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/likemanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/likemanga/likemanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/likemanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/likemanga/likemanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/likemanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/likemanga/likemanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/likemanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/likemanga/likemanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/likemanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/likemanga/likemanga/src/LikeMangaIO.kt b/src/en/likemanga/src/eu/kanade/tachiyomi/extension/en/likemanga/LikeMangaIO.kt
similarity index 100%
rename from multisrc/overrides/likemanga/likemanga/src/LikeMangaIO.kt
rename to src/en/likemanga/src/eu/kanade/tachiyomi/extension/en/likemanga/LikeMangaIO.kt
diff --git a/src/en/lilymanga/build.gradle b/src/en/lilymanga/build.gradle
new file mode 100644
index 000000000..66649e808
--- /dev/null
+++ b/src/en/lilymanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Lily Manga'
+ extClass = '.LilyManga'
+ themePkg = 'madara'
+ baseUrl = 'https://lilymanga.net'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/lilymanga/res/mipmap-hdpi/ic_launcher.png b/src/en/lilymanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lilymanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/lilymanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lilymanga/res/mipmap-mdpi/ic_launcher.png b/src/en/lilymanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lilymanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/lilymanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lilymanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/lilymanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lilymanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/lilymanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lilymanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/lilymanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lilymanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/lilymanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lilymanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/lilymanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lilymanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/lilymanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lilymanga/src/LilyManga.kt b/src/en/lilymanga/src/eu/kanade/tachiyomi/extension/en/lilymanga/LilyManga.kt
similarity index 100%
rename from multisrc/overrides/madara/lilymanga/src/LilyManga.kt
rename to src/en/lilymanga/src/eu/kanade/tachiyomi/extension/en/lilymanga/LilyManga.kt
diff --git a/src/en/lolicon/build.gradle b/src/en/lolicon/build.gradle
new file mode 100644
index 000000000..5f15ce4ab
--- /dev/null
+++ b/src/en/lolicon/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Lolicon'
+ extClass = '.Lolicon'
+ themePkg = 'madara'
+ baseUrl = 'https://lolicon.mobi'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/lolicon/res/mipmap-hdpi/ic_launcher.png b/src/en/lolicon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lolicon/res/mipmap-hdpi/ic_launcher.png
rename to src/en/lolicon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lolicon/res/mipmap-mdpi/ic_launcher.png b/src/en/lolicon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lolicon/res/mipmap-mdpi/ic_launcher.png
rename to src/en/lolicon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lolicon/res/mipmap-xhdpi/ic_launcher.png b/src/en/lolicon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lolicon/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/lolicon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lolicon/res/mipmap-xxhdpi/ic_launcher.png b/src/en/lolicon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lolicon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/lolicon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lolicon/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/lolicon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lolicon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/lolicon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lolicon/src/Lolicon.kt b/src/en/lolicon/src/eu/kanade/tachiyomi/extension/en/lolicon/Lolicon.kt
similarity index 100%
rename from multisrc/overrides/madara/lolicon/src/Lolicon.kt
rename to src/en/lolicon/src/eu/kanade/tachiyomi/extension/en/lolicon/Lolicon.kt
diff --git a/src/en/luffymanga/build.gradle b/src/en/luffymanga/build.gradle
new file mode 100644
index 000000000..57104f5bf
--- /dev/null
+++ b/src/en/luffymanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Luffy Manga'
+ extClass = '.LuffyManga'
+ themePkg = 'madara'
+ baseUrl = 'https://luffymanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/luffymanga/res/mipmap-hdpi/ic_launcher.png b/src/en/luffymanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/luffymanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/luffymanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/luffymanga/res/mipmap-mdpi/ic_launcher.png b/src/en/luffymanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/luffymanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/luffymanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/luffymanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/luffymanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/luffymanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/luffymanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/luffymanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/luffymanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/luffymanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/luffymanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/luffymanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/luffymanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/luffymanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/luffymanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/luffymanga/src/LuffyManga.kt b/src/en/luffymanga/src/eu/kanade/tachiyomi/extension/en/luffymanga/LuffyManga.kt
similarity index 100%
rename from multisrc/overrides/madara/luffymanga/src/LuffyManga.kt
rename to src/en/luffymanga/src/eu/kanade/tachiyomi/extension/en/luffymanga/LuffyManga.kt
diff --git a/src/en/luminousscans/build.gradle b/src/en/luminousscans/build.gradle
new file mode 100644
index 000000000..cb75c28e7
--- /dev/null
+++ b/src/en/luminousscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Luminous Scans'
+ extClass = '.LuminousScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://lumitoon.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/luminousscans/res/mipmap-hdpi/ic_launcher.png b/src/en/luminousscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/luminousscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/luminousscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/luminousscans/res/mipmap-mdpi/ic_launcher.png b/src/en/luminousscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/luminousscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/luminousscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/luminousscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/luminousscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/luminousscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/luminousscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/luminousscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/luminousscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/luminousscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/luminousscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/luminousscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/luminousscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/luminousscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/luminousscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/luminousscans/src/LuminousScans.kt b/src/en/luminousscans/src/eu/kanade/tachiyomi/extension/en/luminousscans/LuminousScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/luminousscans/src/LuminousScans.kt
rename to src/en/luminousscans/src/eu/kanade/tachiyomi/extension/en/luminousscans/LuminousScans.kt
diff --git a/src/en/lunarscans/build.gradle b/src/en/lunarscans/build.gradle
new file mode 100644
index 000000000..cbf6e8b4e
--- /dev/null
+++ b/src/en/lunarscans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Lunar Scans'
+ extClass = '.LunarScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://lunarscan.org'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/lunarscans/res/mipmap-hdpi/ic_launcher.png b/src/en/lunarscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lunarscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/lunarscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lunarscans/res/mipmap-mdpi/ic_launcher.png b/src/en/lunarscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lunarscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/lunarscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lunarscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/lunarscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lunarscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/lunarscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lunarscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/lunarscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lunarscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/lunarscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lunarscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/lunarscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lunarscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/lunarscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lunarscans/src/LunarScans.kt b/src/en/lunarscans/src/eu/kanade/tachiyomi/extension/en/lunarscans/LunarScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/lunarscans/src/LunarScans.kt
rename to src/en/lunarscans/src/eu/kanade/tachiyomi/extension/en/lunarscans/LunarScans.kt
diff --git a/src/en/luxmanga/build.gradle b/src/en/luxmanga/build.gradle
new file mode 100644
index 000000000..cc2f3c6f9
--- /dev/null
+++ b/src/en/luxmanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'LuxManga'
+ extClass = '.LuxManga'
+ themePkg = 'madara'
+ baseUrl = 'https://luxmanga.net'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/luxmanga/src/LuxManga.kt b/src/en/luxmanga/src/eu/kanade/tachiyomi/extension/en/luxmanga/LuxManga.kt
similarity index 100%
rename from multisrc/overrides/madara/luxmanga/src/LuxManga.kt
rename to src/en/luxmanga/src/eu/kanade/tachiyomi/extension/en/luxmanga/LuxManga.kt
diff --git a/src/en/madaradex/build.gradle b/src/en/madaradex/build.gradle
new file mode 100644
index 000000000..24e7dd6e6
--- /dev/null
+++ b/src/en/madaradex/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MadaraDex'
+ extClass = '.MadaraDex'
+ themePkg = 'madara'
+ baseUrl = 'https://madaradex.org'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/madaradex/res/mipmap-hdpi/ic_launcher.png b/src/en/madaradex/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/madaradex/res/mipmap-hdpi/ic_launcher.png
rename to src/en/madaradex/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/madaradex/res/mipmap-mdpi/ic_launcher.png b/src/en/madaradex/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/madaradex/res/mipmap-mdpi/ic_launcher.png
rename to src/en/madaradex/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/madaradex/res/mipmap-xhdpi/ic_launcher.png b/src/en/madaradex/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/madaradex/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/madaradex/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/madaradex/res/mipmap-xxhdpi/ic_launcher.png b/src/en/madaradex/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/madaradex/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/madaradex/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/madaradex/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/madaradex/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/madaradex/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/madaradex/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/madaradex/src/MadaraDex.kt b/src/en/madaradex/src/eu/kanade/tachiyomi/extension/en/madaradex/MadaraDex.kt
similarity index 100%
rename from multisrc/overrides/madara/madaradex/src/MadaraDex.kt
rename to src/en/madaradex/src/eu/kanade/tachiyomi/extension/en/madaradex/MadaraDex.kt
diff --git a/src/en/magusmanga/build.gradle b/src/en/magusmanga/build.gradle
new file mode 100644
index 000000000..c672a502f
--- /dev/null
+++ b/src/en/magusmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Magus Manga'
+ extClass = '.MagusManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://vofeg.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/magusmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/magusmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/magusmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/magusmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/magusmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/magusmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/magusmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/magusmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/magusmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/magusmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/magusmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/magusmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/magusmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/magusmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/magusmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/magusmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/magusmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/magusmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/magusmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/magusmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/magusmanga/src/MagusManga.kt b/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/magusmanga/src/MagusManga.kt
rename to src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt
diff --git a/src/en/manga18club/build.gradle b/src/en/manga18club/build.gradle
new file mode 100644
index 000000000..63920d0af
--- /dev/null
+++ b/src/en/manga18club/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga18.Club'
+ extClass = '.Manga18Club'
+ themePkg = 'manga18'
+ baseUrl = 'https://manga18.club'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/manga18club/src/eu/kanade/tachiyomi/extension/en/manga18club/Manga18Club.kt b/src/en/manga18club/src/eu/kanade/tachiyomi/extension/en/manga18club/Manga18Club.kt
new file mode 100644
index 000000000..417b2b241
--- /dev/null
+++ b/src/en/manga18club/src/eu/kanade/tachiyomi/extension/en/manga18club/Manga18Club.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.manga18club
+
+import eu.kanade.tachiyomi.multisrc.manga18.Manga18
+
+class Manga18Club : Manga18("Manga18.Club", "https://manga18.club", "en")
diff --git a/src/en/manga18fx/build.gradle b/src/en/manga18fx/build.gradle
new file mode 100644
index 000000000..0e2b2df5f
--- /dev/null
+++ b/src/en/manga18fx/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga18fx'
+ extClass = '.Manga18fx'
+ themePkg = 'madara'
+ baseUrl = 'https://manga18fx.com'
+ overrideVersionCode = 5
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manga18fx/res/mipmap-hdpi/ic_launcher.png b/src/en/manga18fx/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga18fx/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manga18fx/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga18fx/res/mipmap-mdpi/ic_launcher.png b/src/en/manga18fx/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga18fx/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manga18fx/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga18fx/res/mipmap-xhdpi/ic_launcher.png b/src/en/manga18fx/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga18fx/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manga18fx/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga18fx/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manga18fx/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga18fx/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manga18fx/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga18fx/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manga18fx/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga18fx/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manga18fx/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga18fx/src/Manga18fx.kt b/src/en/manga18fx/src/eu/kanade/tachiyomi/extension/en/manga18fx/Manga18fx.kt
similarity index 100%
rename from multisrc/overrides/madara/manga18fx/src/Manga18fx.kt
rename to src/en/manga18fx/src/eu/kanade/tachiyomi/extension/en/manga18fx/Manga18fx.kt
diff --git a/src/en/manga18h/build.gradle b/src/en/manga18h/build.gradle
new file mode 100644
index 000000000..b676061a2
--- /dev/null
+++ b/src/en/manga18h/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga 18h'
+ extClass = '.Manga18h'
+ themePkg = 'madara'
+ baseUrl = 'https://manga18h.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manga18h/src/Manga18h.kt b/src/en/manga18h/src/eu/kanade/tachiyomi/extension/en/manga18h/Manga18h.kt
similarity index 100%
rename from multisrc/overrides/madara/manga18h/src/Manga18h.kt
rename to src/en/manga18h/src/eu/kanade/tachiyomi/extension/en/manga18h/Manga18h.kt
diff --git a/src/en/manga18x/build.gradle b/src/en/manga18x/build.gradle
new file mode 100644
index 000000000..03874b69e
--- /dev/null
+++ b/src/en/manga18x/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga 18x'
+ extClass = '.Manga18x'
+ themePkg = 'madara'
+ baseUrl = 'https://manga18x.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manga18x/res/mipmap-hdpi/ic_launcher.png b/src/en/manga18x/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga18x/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manga18x/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga18x/res/mipmap-mdpi/ic_launcher.png b/src/en/manga18x/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga18x/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manga18x/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga18x/res/mipmap-xhdpi/ic_launcher.png b/src/en/manga18x/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga18x/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manga18x/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga18x/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manga18x/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga18x/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manga18x/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga18x/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manga18x/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga18x/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manga18x/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga18x/src/Manga18x.kt b/src/en/manga18x/src/eu/kanade/tachiyomi/extension/en/manga18x/Manga18x.kt
similarity index 100%
rename from multisrc/overrides/madara/manga18x/src/Manga18x.kt
rename to src/en/manga18x/src/eu/kanade/tachiyomi/extension/en/manga18x/Manga18x.kt
diff --git a/src/en/manga247/build.gradle b/src/en/manga247/build.gradle
new file mode 100644
index 000000000..11f61ea24
--- /dev/null
+++ b/src/en/manga247/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = '247Manga'
+ extClass = '.Manga247'
+ themePkg = 'madara'
+ baseUrl = 'https://247manga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manga247/res/mipmap-hdpi/ic_launcher.png b/src/en/manga247/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga247/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manga247/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga247/res/mipmap-mdpi/ic_launcher.png b/src/en/manga247/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga247/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manga247/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga247/res/mipmap-xhdpi/ic_launcher.png b/src/en/manga247/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga247/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manga247/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga247/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manga247/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga247/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manga247/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga247/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manga247/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga247/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manga247/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/manga247/src/eu/kanade/tachiyomi/extension/en/manga247/Manga247.kt b/src/en/manga247/src/eu/kanade/tachiyomi/extension/en/manga247/Manga247.kt
new file mode 100644
index 000000000..477150c22
--- /dev/null
+++ b/src/en/manga247/src/eu/kanade/tachiyomi/extension/en/manga247/Manga247.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.manga247
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Manga247 : Madara("247Manga", "https://247manga.com", "en")
diff --git a/src/en/manga347/build.gradle b/src/en/manga347/build.gradle
new file mode 100644
index 000000000..780da7d23
--- /dev/null
+++ b/src/en/manga347/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga347'
+ extClass = '.Manga347'
+ themePkg = 'madara'
+ baseUrl = 'https://manga347.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manga347/res/mipmap-hdpi/ic_launcher.png b/src/en/manga347/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga347/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manga347/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga347/res/mipmap-mdpi/ic_launcher.png b/src/en/manga347/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga347/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manga347/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga347/res/mipmap-xhdpi/ic_launcher.png b/src/en/manga347/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga347/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manga347/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga347/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manga347/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga347/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manga347/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga347/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manga347/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga347/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manga347/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga347/src/Manga347.kt b/src/en/manga347/src/eu/kanade/tachiyomi/extension/en/manga347/Manga347.kt
similarity index 100%
rename from multisrc/overrides/madara/manga347/src/Manga347.kt
rename to src/en/manga347/src/eu/kanade/tachiyomi/extension/en/manga347/Manga347.kt
diff --git a/src/en/manga3s/build.gradle b/src/en/manga3s/build.gradle
new file mode 100644
index 000000000..05aed33fc
--- /dev/null
+++ b/src/en/manga3s/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga3S'
+ extClass = '.Manga3S'
+ themePkg = 'madara'
+ baseUrl = 'https://manga3s.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manga3s/res/mipmap-hdpi/ic_launcher.png b/src/en/manga3s/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga3s/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manga3s/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga3s/res/mipmap-mdpi/ic_launcher.png b/src/en/manga3s/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga3s/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manga3s/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga3s/res/mipmap-xhdpi/ic_launcher.png b/src/en/manga3s/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga3s/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manga3s/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga3s/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manga3s/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga3s/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manga3s/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga3s/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manga3s/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga3s/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manga3s/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga3s/src/Manga3S.kt b/src/en/manga3s/src/eu/kanade/tachiyomi/extension/en/manga3s/Manga3S.kt
similarity index 100%
rename from multisrc/overrides/madara/manga3s/src/Manga3S.kt
rename to src/en/manga3s/src/eu/kanade/tachiyomi/extension/en/manga3s/Manga3S.kt
diff --git a/src/en/manga68/build.gradle b/src/en/manga68/build.gradle
new file mode 100644
index 000000000..d845e5d35
--- /dev/null
+++ b/src/en/manga68/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga68'
+ extClass = '.Manga68'
+ themePkg = 'madara'
+ baseUrl = 'https://manga68.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manga68/res/mipmap-hdpi/ic_launcher.png b/src/en/manga68/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga68/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manga68/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga68/res/mipmap-mdpi/ic_launcher.png b/src/en/manga68/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga68/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manga68/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga68/res/mipmap-xhdpi/ic_launcher.png b/src/en/manga68/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga68/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manga68/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga68/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manga68/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga68/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manga68/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manga68/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manga68/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manga68/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manga68/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/manga68/src/eu/kanade/tachiyomi/extension/en/manga68/Manga68.kt b/src/en/manga68/src/eu/kanade/tachiyomi/extension/en/manga68/Manga68.kt
new file mode 100644
index 000000000..7bb4ad579
--- /dev/null
+++ b/src/en/manga68/src/eu/kanade/tachiyomi/extension/en/manga68/Manga68.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.manga68
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Manga68 : Madara("Manga68", "https://manga68.com", "en")
diff --git a/src/en/mangaaction/build.gradle b/src/en/mangaaction/build.gradle
new file mode 100644
index 000000000..99664311e
--- /dev/null
+++ b/src/en/mangaaction/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Action'
+ extClass = '.MangaAction'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaaction.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaaction/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaaction/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaaction/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaaction/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaaction/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaaction/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaaction/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaaction/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaaction/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaaction/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaaction/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaaction/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaaction/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaaction/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaaction/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaaction/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaaction/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaaction/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaaction/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaaction/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangaaction/src/eu/kanade/tachiyomi/extension/en/mangaaction/MangaAction.kt b/src/en/mangaaction/src/eu/kanade/tachiyomi/extension/en/mangaaction/MangaAction.kt
new file mode 100644
index 000000000..0f02074b6
--- /dev/null
+++ b/src/en/mangaaction/src/eu/kanade/tachiyomi/extension/en/mangaaction/MangaAction.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangaaction
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaAction : Madara("Manga Action", "https://mangaaction.com", "en")
diff --git a/src/en/mangabat/build.gradle b/src/en/mangabat/build.gradle
new file mode 100644
index 000000000..b5fc2f6f7
--- /dev/null
+++ b/src/en/mangabat/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangabat'
+ extClass = '.Mangabat'
+ themePkg = 'mangabox'
+ baseUrl = 'https://m.mangabat.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangabox/mangabat/res/mipmap-hdpi/ic_launcher.png b/src/en/mangabat/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangabat/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangabat/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangabat/res/mipmap-mdpi/ic_launcher.png b/src/en/mangabat/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangabat/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangabat/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangabat/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangabat/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangabat/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangabat/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangabat/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangabat/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangabat/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangabat/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangabat/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangabat/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangabat/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangabat/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangabat/src/Mangabat.kt b/src/en/mangabat/src/eu/kanade/tachiyomi/extension/en/mangabat/Mangabat.kt
similarity index 100%
rename from multisrc/overrides/mangabox/mangabat/src/Mangabat.kt
rename to src/en/mangabat/src/eu/kanade/tachiyomi/extension/en/mangabat/Mangabat.kt
diff --git a/src/en/mangabee/build.gradle b/src/en/mangabee/build.gradle
new file mode 100644
index 000000000..a2cb0ba8f
--- /dev/null
+++ b/src/en/mangabee/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga Bee'
+ extClass = '.MangaBee'
+ themePkg = 'madara'
+ baseUrl = 'https://mangabee.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangabee/res/mipmap-hdpi/ic_launcher.png b/src/en/mangabee/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabee/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangabee/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabee/res/mipmap-mdpi/ic_launcher.png b/src/en/mangabee/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabee/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangabee/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabee/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangabee/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabee/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangabee/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabee/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangabee/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabee/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangabee/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabee/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangabee/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabee/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangabee/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabee/src/MangaBee.kt b/src/en/mangabee/src/eu/kanade/tachiyomi/extension/en/mangabee/MangaBee.kt
similarity index 100%
rename from multisrc/overrides/madara/mangabee/src/MangaBee.kt
rename to src/en/mangabee/src/eu/kanade/tachiyomi/extension/en/mangabee/MangaBee.kt
diff --git a/src/en/mangabin/build.gradle b/src/en/mangabin/build.gradle
new file mode 100644
index 000000000..c782dfe2d
--- /dev/null
+++ b/src/en/mangabin/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Bin'
+ extClass = '.MangaBin'
+ themePkg = 'madara'
+ baseUrl = 'https://mangabin.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangabin/res/mipmap-hdpi/ic_launcher.png b/src/en/mangabin/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabin/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangabin/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabin/res/mipmap-mdpi/ic_launcher.png b/src/en/mangabin/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabin/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangabin/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabin/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangabin/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabin/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangabin/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabin/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangabin/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabin/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangabin/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabin/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangabin/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabin/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangabin/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangabin/src/eu/kanade/tachiyomi/extension/en/mangabin/MangaBin.kt b/src/en/mangabin/src/eu/kanade/tachiyomi/extension/en/mangabin/MangaBin.kt
new file mode 100644
index 000000000..6fb778098
--- /dev/null
+++ b/src/en/mangabin/src/eu/kanade/tachiyomi/extension/en/mangabin/MangaBin.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangabin
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaBin : Madara("Manga Bin", "https://mangabin.com", "en")
diff --git a/src/en/mangabob/build.gradle b/src/en/mangabob/build.gradle
new file mode 100644
index 000000000..8ce9db439
--- /dev/null
+++ b/src/en/mangabob/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaBob'
+ extClass = '.MangaBob'
+ themePkg = 'madara'
+ baseUrl = 'https://mangabob.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangabob/res/mipmap-hdpi/ic_launcher.png b/src/en/mangabob/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabob/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangabob/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabob/res/mipmap-mdpi/ic_launcher.png b/src/en/mangabob/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabob/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangabob/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabob/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangabob/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabob/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangabob/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabob/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangabob/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabob/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangabob/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangabob/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangabob/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangabob/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangabob/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangabob/src/eu/kanade/tachiyomi/extension/en/mangabob/MangaBob.kt b/src/en/mangabob/src/eu/kanade/tachiyomi/extension/en/mangabob/MangaBob.kt
new file mode 100644
index 000000000..50b9ced7b
--- /dev/null
+++ b/src/en/mangabob/src/eu/kanade/tachiyomi/extension/en/mangabob/MangaBob.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangabob
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaBob : Madara("MangaBob", "https://mangabob.com", "en")
diff --git a/src/en/mangaboss/build.gradle b/src/en/mangaboss/build.gradle
new file mode 100644
index 000000000..bff67a111
--- /dev/null
+++ b/src/en/mangaboss/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaVisa'
+ extClass = '.MangaVisa'
+ themePkg = 'madara'
+ baseUrl = 'https://mangavisa.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaboss/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaboss/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaboss/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaboss/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaboss/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaboss/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaboss/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaboss/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaboss/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaboss/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaboss/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaboss/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaboss/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaboss/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaboss/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaboss/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaboss/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaboss/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaboss/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaboss/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaboss/src/MangaVisa.kt b/src/en/mangaboss/src/eu/kanade/tachiyomi/extension/en/mangaboss/MangaVisa.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaboss/src/MangaVisa.kt
rename to src/en/mangaboss/src/eu/kanade/tachiyomi/extension/en/mangaboss/MangaVisa.kt
diff --git a/src/en/mangabuddy/build.gradle b/src/en/mangabuddy/build.gradle
new file mode 100644
index 000000000..0a3fcbf2e
--- /dev/null
+++ b/src/en/mangabuddy/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaBuddy'
+ extClass = '.MangaBuddy'
+ themePkg = 'madtheme'
+ baseUrl = 'https://mangabuddy.com'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madtheme/mangabuddy/res/mipmap-hdpi/ic_launcher.png b/src/en/mangabuddy/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangabuddy/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangabuddy/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangabuddy/res/mipmap-mdpi/ic_launcher.png b/src/en/mangabuddy/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangabuddy/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangabuddy/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangabuddy/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangabuddy/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangabuddy/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangabuddy/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangabuddy/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangabuddy/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangabuddy/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangabuddy/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangabuddy/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangabuddy/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangabuddy/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangabuddy/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangabuddy/src/eu/kanade/tachiyomi/extension/en/mangabuddy/MangaBuddy.kt b/src/en/mangabuddy/src/eu/kanade/tachiyomi/extension/en/mangabuddy/MangaBuddy.kt
new file mode 100644
index 000000000..12a609d05
--- /dev/null
+++ b/src/en/mangabuddy/src/eu/kanade/tachiyomi/extension/en/mangabuddy/MangaBuddy.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangabuddy
+
+import eu.kanade.tachiyomi.multisrc.madtheme.MadTheme
+
+class MangaBuddy : MadTheme("MangaBuddy", "https://mangabuddy.com", "en")
diff --git a/src/en/mangachill/build.gradle b/src/en/mangachill/build.gradle
new file mode 100644
index 000000000..526cf4bb1
--- /dev/null
+++ b/src/en/mangachill/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Chill'
+ extClass = '.MangaChill'
+ themePkg = 'madara'
+ baseUrl = 'https://toonchill.com'
+ overrideVersionCode = 7
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangachill/res/mipmap-hdpi/ic_launcher.png b/src/en/mangachill/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangachill/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangachill/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangachill/res/mipmap-mdpi/ic_launcher.png b/src/en/mangachill/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangachill/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangachill/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangachill/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangachill/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangachill/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangachill/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangachill/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangachill/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangachill/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangachill/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangachill/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangachill/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangachill/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangachill/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangachill/src/eu/kanade/tachiyomi/extension/en/mangachill/MangaChill.kt b/src/en/mangachill/src/eu/kanade/tachiyomi/extension/en/mangachill/MangaChill.kt
new file mode 100644
index 000000000..48a826f5d
--- /dev/null
+++ b/src/en/mangachill/src/eu/kanade/tachiyomi/extension/en/mangachill/MangaChill.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangachill
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaChill : Madara("Manga Chill", "https://toonchill.com", "en")
diff --git a/src/en/mangaclash/build.gradle b/src/en/mangaclash/build.gradle
new file mode 100644
index 000000000..d5ecff451
--- /dev/null
+++ b/src/en/mangaclash/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaClash'
+ extClass = '.MangaClash'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaclash.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaclash/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaclash/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaclash/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaclash/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaclash/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaclash/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaclash/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaclash/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaclash/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaclash/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaclash/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaclash/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaclash/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaclash/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaclash/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaclash/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaclash/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaclash/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaclash/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaclash/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaclash/src/MangaClash.kt b/src/en/mangaclash/src/eu/kanade/tachiyomi/extension/en/mangaclash/MangaClash.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaclash/src/MangaClash.kt
rename to src/en/mangaclash/src/eu/kanade/tachiyomi/extension/en/mangaclash/MangaClash.kt
diff --git a/src/en/mangaclashtv/build.gradle b/src/en/mangaclashtv/build.gradle
new file mode 100644
index 000000000..8f44ae1e6
--- /dev/null
+++ b/src/en/mangaclashtv/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaClash.tv (unoriginal)'
+ extClass = '.MangaClashTv'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaclash.tv'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaclashtv/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaclashtv/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaclashtv/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaclashtv/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaclashtv/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaclashtv/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaclashtv/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaclashtv/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaclashtv/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaclashtv/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaclashtv/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaclashtv/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaclashtv/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaclashtv/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaclashtv/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaclashtv/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaclashtv/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaclashtv/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaclashtv/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaclashtv/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaclashtv/src/MangaClashTv.kt b/src/en/mangaclashtv/src/eu/kanade/tachiyomi/extension/en/mangaclashtv/MangaClashTv.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaclashtv/src/MangaClashTv.kt
rename to src/en/mangaclashtv/src/eu/kanade/tachiyomi/extension/en/mangaclashtv/MangaClashTv.kt
diff --git a/src/en/mangacultivator/build.gradle b/src/en/mangacultivator/build.gradle
new file mode 100644
index 000000000..86549abb5
--- /dev/null
+++ b/src/en/mangacultivator/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaCultivator'
+ extClass = '.MangaCultivator'
+ themePkg = 'madara'
+ baseUrl = 'https://mangacultivator.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangacultivator/res/mipmap-hdpi/ic_launcher.png b/src/en/mangacultivator/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacultivator/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangacultivator/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacultivator/res/mipmap-mdpi/ic_launcher.png b/src/en/mangacultivator/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacultivator/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangacultivator/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacultivator/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangacultivator/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacultivator/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangacultivator/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacultivator/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangacultivator/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacultivator/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangacultivator/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacultivator/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangacultivator/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacultivator/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangacultivator/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacultivator/src/MangaCultivator.kt b/src/en/mangacultivator/src/eu/kanade/tachiyomi/extension/en/mangacultivator/MangaCultivator.kt
similarity index 100%
rename from multisrc/overrides/madara/mangacultivator/src/MangaCultivator.kt
rename to src/en/mangacultivator/src/eu/kanade/tachiyomi/extension/en/mangacultivator/MangaCultivator.kt
diff --git a/src/en/mangacute/build.gradle b/src/en/mangacute/build.gradle
new file mode 100644
index 000000000..c933aa5fc
--- /dev/null
+++ b/src/en/mangacute/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaCute'
+ extClass = '.MangaCute'
+ themePkg = 'madtheme'
+ baseUrl = 'https://mangacute.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madtheme/mangacute/res/mipmap-hdpi/ic_launcher.png b/src/en/mangacute/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangacute/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangacute/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangacute/res/mipmap-mdpi/ic_launcher.png b/src/en/mangacute/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangacute/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangacute/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangacute/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangacute/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangacute/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangacute/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangacute/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangacute/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangacute/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangacute/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangacute/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangacute/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangacute/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangacute/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangacute/src/eu/kanade/tachiyomi/extension/en/mangacute/MangaCute.kt b/src/en/mangacute/src/eu/kanade/tachiyomi/extension/en/mangacute/MangaCute.kt
new file mode 100644
index 000000000..5550c7c41
--- /dev/null
+++ b/src/en/mangacute/src/eu/kanade/tachiyomi/extension/en/mangacute/MangaCute.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangacute
+
+import eu.kanade.tachiyomi.multisrc.madtheme.MadTheme
+
+class MangaCute : MadTheme("MangaCute", "https://mangacute.com", "en")
diff --git a/src/en/mangacv/build.gradle b/src/en/mangacv/build.gradle
new file mode 100644
index 000000000..a75c39c08
--- /dev/null
+++ b/src/en/mangacv/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaCV'
+ extClass = '.MangaCV'
+ themePkg = 'madara'
+ baseUrl = 'https://mangacv.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangacv/res/mipmap-hdpi/ic_launcher.png b/src/en/mangacv/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacv/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangacv/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacv/res/mipmap-mdpi/ic_launcher.png b/src/en/mangacv/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacv/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangacv/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacv/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangacv/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacv/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangacv/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacv/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangacv/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacv/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangacv/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacv/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangacv/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacv/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangacv/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangacv/src/eu/kanade/tachiyomi/extension/en/mangacv/MangaCV.kt b/src/en/mangacv/src/eu/kanade/tachiyomi/extension/en/mangacv/MangaCV.kt
new file mode 100644
index 000000000..2e375624d
--- /dev/null
+++ b/src/en/mangacv/src/eu/kanade/tachiyomi/extension/en/mangacv/MangaCV.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangacv
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaCV : Madara("MangaCV", "https://mangacv.com", "en")
diff --git a/src/en/mangadash1001com/build.gradle b/src/en/mangadash1001com/build.gradle
new file mode 100644
index 000000000..b4e253f48
--- /dev/null
+++ b/src/en/mangadash1001com/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga-1001.com'
+ extClass = '.MangaDash1001Com'
+ themePkg = 'madara'
+ baseUrl = 'https://manga-1001.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangadash1001com/res/mipmap-hdpi/ic_launcher.png b/src/en/mangadash1001com/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadash1001com/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangadash1001com/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadash1001com/res/mipmap-mdpi/ic_launcher.png b/src/en/mangadash1001com/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadash1001com/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangadash1001com/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadash1001com/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangadash1001com/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadash1001com/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangadash1001com/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadash1001com/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangadash1001com/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadash1001com/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangadash1001com/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadash1001com/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangadash1001com/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadash1001com/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangadash1001com/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadash1001com/src/MangaDash1001Com.kt b/src/en/mangadash1001com/src/eu/kanade/tachiyomi/extension/en/mangadash1001com/MangaDash1001Com.kt
similarity index 100%
rename from multisrc/overrides/madara/mangadash1001com/src/MangaDash1001Com.kt
rename to src/en/mangadash1001com/src/eu/kanade/tachiyomi/extension/en/mangadash1001com/MangaDash1001Com.kt
diff --git a/src/en/mangadig/build.gradle b/src/en/mangadig/build.gradle
new file mode 100644
index 000000000..d0c30c07d
--- /dev/null
+++ b/src/en/mangadig/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaDig'
+ extClass = '.MangaDig'
+ themePkg = 'colamanga'
+ baseUrl = 'https://mangadig.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/colamanga/mangadig/res/mipmap-hdpi/ic_launcher.png b/src/en/mangadig/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colamanga/mangadig/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangadig/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/colamanga/mangadig/res/mipmap-mdpi/ic_launcher.png b/src/en/mangadig/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colamanga/mangadig/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangadig/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/colamanga/mangadig/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangadig/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colamanga/mangadig/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangadig/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colamanga/mangadig/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangadig/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colamanga/mangadig/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangadig/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colamanga/mangadig/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangadig/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colamanga/mangadig/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangadig/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colamanga/mangadig/src/MangaDig.kt b/src/en/mangadig/src/eu/kanade/tachiyomi/extension/en/mangadig/MangaDig.kt
similarity index 100%
rename from multisrc/overrides/colamanga/mangadig/src/MangaDig.kt
rename to src/en/mangadig/src/eu/kanade/tachiyomi/extension/en/mangadig/MangaDig.kt
diff --git a/src/en/mangadinotop/build.gradle b/src/en/mangadinotop/build.gradle
new file mode 100644
index 000000000..d7d2b70c9
--- /dev/null
+++ b/src/en/mangadinotop/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaDino.top (unoriginal)'
+ extClass = '.MangaDinoTop'
+ themePkg = 'madara'
+ baseUrl = 'https://mangadino.top'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangadinotop/res/mipmap-hdpi/ic_launcher.png b/src/en/mangadinotop/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadinotop/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangadinotop/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadinotop/res/mipmap-mdpi/ic_launcher.png b/src/en/mangadinotop/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadinotop/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangadinotop/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadinotop/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangadinotop/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadinotop/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangadinotop/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadinotop/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangadinotop/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadinotop/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangadinotop/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadinotop/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangadinotop/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadinotop/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangadinotop/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadinotop/src/MangaDinoTop.kt b/src/en/mangadinotop/src/eu/kanade/tachiyomi/extension/en/mangadinotop/MangaDinoTop.kt
similarity index 100%
rename from multisrc/overrides/madara/mangadinotop/src/MangaDinoTop.kt
rename to src/en/mangadinotop/src/eu/kanade/tachiyomi/extension/en/mangadinotop/MangaDinoTop.kt
diff --git a/src/en/mangadistrict/build.gradle b/src/en/mangadistrict/build.gradle
new file mode 100644
index 000000000..38d7823e6
--- /dev/null
+++ b/src/en/mangadistrict/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga District'
+ extClass = '.MangaDistrict'
+ themePkg = 'madara'
+ baseUrl = 'https://mangadistrict.com'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangadistrict/res/mipmap-hdpi/ic_launcher.png b/src/en/mangadistrict/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadistrict/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangadistrict/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadistrict/res/mipmap-mdpi/ic_launcher.png b/src/en/mangadistrict/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadistrict/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangadistrict/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadistrict/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangadistrict/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadistrict/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangadistrict/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadistrict/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangadistrict/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadistrict/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangadistrict/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadistrict/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangadistrict/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadistrict/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangadistrict/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadistrict/src/MangaDistrict.kt b/src/en/mangadistrict/src/eu/kanade/tachiyomi/extension/en/mangadistrict/MangaDistrict.kt
similarity index 100%
rename from multisrc/overrides/madara/mangadistrict/src/MangaDistrict.kt
rename to src/en/mangadistrict/src/eu/kanade/tachiyomi/extension/en/mangadistrict/MangaDistrict.kt
diff --git a/src/en/mangaeffect/build.gradle b/src/en/mangaeffect/build.gradle
new file mode 100644
index 000000000..ce4379226
--- /dev/null
+++ b/src/en/mangaeffect/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaEffect'
+ extClass = '.MangaEffect'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaeffect.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaeffect/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaeffect/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaeffect/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaeffect/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaeffect/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaeffect/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaeffect/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaeffect/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaeffect/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaeffect/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaeffect/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaeffect/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaeffect/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaeffect/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaeffect/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaeffect/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaeffect/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaeffect/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaeffect/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaeffect/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaeffect/src/MangaEffect.kt b/src/en/mangaeffect/src/eu/kanade/tachiyomi/extension/en/mangaeffect/MangaEffect.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaeffect/src/MangaEffect.kt
rename to src/en/mangaeffect/src/eu/kanade/tachiyomi/extension/en/mangaeffect/MangaEffect.kt
diff --git a/src/en/mangafastcom/build.gradle b/src/en/mangafastcom/build.gradle
new file mode 100644
index 000000000..4f6658ba0
--- /dev/null
+++ b/src/en/mangafastcom/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga-fast.com'
+ extClass = '.Mangafastcom'
+ themePkg = 'madara'
+ baseUrl = 'https://manga-fast.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangafastcom/res/mipmap-hdpi/ic_launcher.png b/src/en/mangafastcom/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafastcom/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangafastcom/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafastcom/res/mipmap-mdpi/ic_launcher.png b/src/en/mangafastcom/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafastcom/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangafastcom/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafastcom/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangafastcom/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafastcom/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangafastcom/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafastcom/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangafastcom/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafastcom/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangafastcom/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafastcom/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangafastcom/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafastcom/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangafastcom/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt b/src/en/mangafastcom/src/eu/kanade/tachiyomi/extension/en/mangafastcom/Mangafastcom.kt
similarity index 100%
rename from multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt
rename to src/en/mangafastcom/src/eu/kanade/tachiyomi/extension/en/mangafastcom/Mangafastcom.kt
diff --git a/src/en/mangafirstonline/build.gradle b/src/en/mangafirstonline/build.gradle
new file mode 100644
index 000000000..c6ce58abe
--- /dev/null
+++ b/src/en/mangafirstonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga1st.online'
+ extClass = '.MangaFirstOnline'
+ themePkg = 'madara'
+ baseUrl = 'https://manga1st.online'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangafirstonline/res/mipmap-hdpi/ic_launcher.png b/src/en/mangafirstonline/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafirstonline/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangafirstonline/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafirstonline/res/mipmap-mdpi/ic_launcher.png b/src/en/mangafirstonline/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafirstonline/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangafirstonline/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafirstonline/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangafirstonline/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafirstonline/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangafirstonline/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafirstonline/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangafirstonline/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafirstonline/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangafirstonline/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafirstonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangafirstonline/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafirstonline/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangafirstonline/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangafirstonline/src/eu/kanade/tachiyomi/extension/en/mangafirstonline/MangaFirstOnline.kt b/src/en/mangafirstonline/src/eu/kanade/tachiyomi/extension/en/mangafirstonline/MangaFirstOnline.kt
new file mode 100644
index 000000000..a860bc49f
--- /dev/null
+++ b/src/en/mangafirstonline/src/eu/kanade/tachiyomi/extension/en/mangafirstonline/MangaFirstOnline.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangafirstonline
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaFirstOnline : Madara("Manga1st.online", "https://manga1st.online", "en")
diff --git a/src/en/mangaforest/build.gradle b/src/en/mangaforest/build.gradle
new file mode 100644
index 000000000..3d6dc6a73
--- /dev/null
+++ b/src/en/mangaforest/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaForest'
+ extClass = '.MangaForest'
+ themePkg = 'madtheme'
+ baseUrl = 'https://mangaforest.me'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madtheme/mangaforest/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaforest/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangaforest/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaforest/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangaforest/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaforest/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangaforest/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaforest/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangaforest/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaforest/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangaforest/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaforest/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangaforest/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaforest/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangaforest/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaforest/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangaforest/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaforest/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangaforest/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaforest/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangaforest/src/eu/kanade/tachiyomi/extension/en/mangaforest/MangaForest.kt b/src/en/mangaforest/src/eu/kanade/tachiyomi/extension/en/mangaforest/MangaForest.kt
new file mode 100644
index 000000000..b22e9a13c
--- /dev/null
+++ b/src/en/mangaforest/src/eu/kanade/tachiyomi/extension/en/mangaforest/MangaForest.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangaforest
+
+import eu.kanade.tachiyomi.multisrc.madtheme.MadTheme
+
+class MangaForest : MadTheme("MangaForest", "https://mangaforest.me", "en")
diff --git a/src/en/mangaforfreecom/build.gradle b/src/en/mangaforfreecom/build.gradle
new file mode 100644
index 000000000..6fc6e0250
--- /dev/null
+++ b/src/en/mangaforfreecom/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Mangaforfree.com'
+ extClass = '.Mangaforfreecom'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaforfree.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaforfreecom/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaforfreecom/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaforfreecom/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaforfreecom/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaforfreecom/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaforfreecom/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaforfreecom/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaforfreecom/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaforfreecom/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaforfreecom/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaforfreecom/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaforfreecom/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaforfreecom/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaforfreecom/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaforfreecom/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaforfreecom/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaforfreecom/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaforfreecom/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaforfreecom/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaforfreecom/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaforfreecom/src/Mangaforfreecom.kt b/src/en/mangaforfreecom/src/eu/kanade/tachiyomi/extension/en/mangaforfreecom/Mangaforfreecom.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaforfreecom/src/Mangaforfreecom.kt
rename to src/en/mangaforfreecom/src/eu/kanade/tachiyomi/extension/en/mangaforfreecom/Mangaforfreecom.kt
diff --git a/src/en/mangafoxfull/build.gradle b/src/en/mangafoxfull/build.gradle
new file mode 100644
index 000000000..aa3373723
--- /dev/null
+++ b/src/en/mangafoxfull/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaFoxFull'
+ extClass = '.MangaFoxFull'
+ themePkg = 'madara'
+ baseUrl = 'https://mangafoxfull.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangafoxfull/res/mipmap-hdpi/ic_launcher.png b/src/en/mangafoxfull/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafoxfull/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangafoxfull/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafoxfull/res/mipmap-mdpi/ic_launcher.png b/src/en/mangafoxfull/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafoxfull/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangafoxfull/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafoxfull/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangafoxfull/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafoxfull/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangafoxfull/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafoxfull/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangafoxfull/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafoxfull/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangafoxfull/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafoxfull/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangafoxfull/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafoxfull/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangafoxfull/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangafoxfull/src/eu/kanade/tachiyomi/extension/en/mangafoxfull/MangaFoxFull.kt b/src/en/mangafoxfull/src/eu/kanade/tachiyomi/extension/en/mangafoxfull/MangaFoxFull.kt
new file mode 100644
index 000000000..7abe5b4ab
--- /dev/null
+++ b/src/en/mangafoxfull/src/eu/kanade/tachiyomi/extension/en/mangafoxfull/MangaFoxFull.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangafoxfull
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaFoxFull : Madara("MangaFoxFull", "https://mangafoxfull.com", "en")
diff --git a/src/en/mangafoxfun/build.gradle b/src/en/mangafoxfun/build.gradle
new file mode 100644
index 000000000..523e09c02
--- /dev/null
+++ b/src/en/mangafoxfun/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaFox.fun'
+ extClass = '.MangaFoxFun'
+ themePkg = 'mangahub'
+ baseUrl = 'https://mangafox.fun'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangahub/mangafoxfun/src/MangaFoxFun.kt b/src/en/mangafoxfun/src/eu/kanade/tachiyomi/extension/en/mangafoxfun/MangaFoxFun.kt
similarity index 100%
rename from multisrc/overrides/mangahub/mangafoxfun/src/MangaFoxFun.kt
rename to src/en/mangafoxfun/src/eu/kanade/tachiyomi/extension/en/mangafoxfun/MangaFoxFun.kt
diff --git a/src/en/mangafreakonline/build.gradle b/src/en/mangafreakonline/build.gradle
new file mode 100644
index 000000000..3b2da9f4d
--- /dev/null
+++ b/src/en/mangafreakonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaFreak.online'
+ extClass = '.MangaFreakOnline'
+ themePkg = 'madara'
+ baseUrl = 'https://mangafreak.online'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangafreakonline/res/mipmap-hdpi/ic_launcher.png b/src/en/mangafreakonline/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafreakonline/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangafreakonline/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafreakonline/res/mipmap-mdpi/ic_launcher.png b/src/en/mangafreakonline/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafreakonline/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangafreakonline/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafreakonline/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangafreakonline/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafreakonline/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangafreakonline/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafreakonline/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangafreakonline/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafreakonline/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangafreakonline/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafreakonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangafreakonline/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafreakonline/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangafreakonline/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafreakonline/src/MangaFreakOnline.kt b/src/en/mangafreakonline/src/eu/kanade/tachiyomi/extension/en/mangafreakonline/MangaFreakOnline.kt
similarity index 100%
rename from multisrc/overrides/madara/mangafreakonline/src/MangaFreakOnline.kt
rename to src/en/mangafreakonline/src/eu/kanade/tachiyomi/extension/en/mangafreakonline/MangaFreakOnline.kt
diff --git a/src/en/mangagalaxy/build.gradle b/src/en/mangagalaxy/build.gradle
new file mode 100644
index 000000000..8c9bbb863
--- /dev/null
+++ b/src/en/mangagalaxy/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Galaxy'
+ extClass = '.MangaGalaxy'
+ themePkg = 'madara'
+ baseUrl = 'https://mangagalaxy.me'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangagalaxy/res/mipmap-hdpi/ic_launcher.png b/src/en/mangagalaxy/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagalaxy/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangagalaxy/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagalaxy/res/mipmap-mdpi/ic_launcher.png b/src/en/mangagalaxy/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagalaxy/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangagalaxy/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagalaxy/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangagalaxy/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagalaxy/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangagalaxy/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagalaxy/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangagalaxy/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagalaxy/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangagalaxy/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagalaxy/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangagalaxy/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagalaxy/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangagalaxy/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagalaxy/src/MangaGalaxy.kt b/src/en/mangagalaxy/src/eu/kanade/tachiyomi/extension/en/mangagalaxy/MangaGalaxy.kt
similarity index 100%
rename from multisrc/overrides/madara/mangagalaxy/src/MangaGalaxy.kt
rename to src/en/mangagalaxy/src/eu/kanade/tachiyomi/extension/en/mangagalaxy/MangaGalaxy.kt
diff --git a/src/en/mangagg/build.gradle b/src/en/mangagg/build.gradle
new file mode 100644
index 000000000..076bfe8ef
--- /dev/null
+++ b/src/en/mangagg/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaGG'
+ extClass = '.MangaGG'
+ themePkg = 'madara'
+ baseUrl = 'https://mangagg.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangagg/res/mipmap-hdpi/ic_launcher.png b/src/en/mangagg/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagg/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangagg/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagg/res/mipmap-mdpi/ic_launcher.png b/src/en/mangagg/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagg/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangagg/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagg/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangagg/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagg/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangagg/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagg/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangagg/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagg/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangagg/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagg/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangagg/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagg/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangagg/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangagg/src/eu/kanade/tachiyomi/extension/en/mangagg/MangaGG.kt b/src/en/mangagg/src/eu/kanade/tachiyomi/extension/en/mangagg/MangaGG.kt
new file mode 100644
index 000000000..4e74d0cbd
--- /dev/null
+++ b/src/en/mangagg/src/eu/kanade/tachiyomi/extension/en/mangagg/MangaGG.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangagg
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaGG : Madara("MangaGG", "https://mangagg.com", "en")
diff --git a/src/en/mangahentai/build.gradle b/src/en/mangahentai/build.gradle
new file mode 100644
index 000000000..5ff0b2dc3
--- /dev/null
+++ b/src/en/mangahentai/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga Hentai'
+ extClass = '.MangaHentai'
+ themePkg = 'madara'
+ baseUrl = 'https://mangahentai.me'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangahentai/res/mipmap-hdpi/ic_launcher.png b/src/en/mangahentai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangahentai/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangahentai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangahentai/res/mipmap-mdpi/ic_launcher.png b/src/en/mangahentai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangahentai/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangahentai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangahentai/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangahentai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangahentai/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangahentai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangahentai/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangahentai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangahentai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangahentai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangahentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangahentai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangahentai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangahentai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangahentai/src/MangaHentai.kt b/src/en/mangahentai/src/eu/kanade/tachiyomi/extension/en/mangahentai/MangaHentai.kt
similarity index 100%
rename from multisrc/overrides/madara/mangahentai/src/MangaHentai.kt
rename to src/en/mangahentai/src/eu/kanade/tachiyomi/extension/en/mangahentai/MangaHentai.kt
diff --git a/src/en/mangahereonl/build.gradle b/src/en/mangahereonl/build.gradle
new file mode 100644
index 000000000..117a3d5ba
--- /dev/null
+++ b/src/en/mangahereonl/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaHere.onl'
+ extClass = '.MangaHereOnl'
+ themePkg = 'mangahub'
+ baseUrl = 'https://mangahere.onl'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangahub/mangahereonl/src/MangaHereOnl.kt b/src/en/mangahereonl/src/eu/kanade/tachiyomi/extension/en/mangahereonl/MangaHereOnl.kt
similarity index 100%
rename from multisrc/overrides/mangahub/mangahereonl/src/MangaHereOnl.kt
rename to src/en/mangahereonl/src/eu/kanade/tachiyomi/extension/en/mangahereonl/MangaHereOnl.kt
diff --git a/src/en/mangahubio/build.gradle b/src/en/mangahubio/build.gradle
new file mode 100644
index 000000000..eb7917511
--- /dev/null
+++ b/src/en/mangahubio/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaHub'
+ extClass = '.MangaHubIo'
+ themePkg = 'mangahub'
+ baseUrl = 'https://mangahub.io'
+ overrideVersionCode = 10
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangahub/mangahubio/res/mipmap-hdpi/ic_launcher.png b/src/en/mangahubio/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangahubio/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangahubio/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangahubio/res/mipmap-mdpi/ic_launcher.png b/src/en/mangahubio/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangahubio/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangahubio/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangahubio/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangahubio/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangahubio/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangahubio/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangahubio/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangahubio/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangahubio/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangahubio/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangahubio/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangahubio/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangahubio/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangahubio/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangahubio/src/MangaHubIo.kt b/src/en/mangahubio/src/eu/kanade/tachiyomi/extension/en/mangahubio/MangaHubIo.kt
similarity index 100%
rename from multisrc/overrides/mangahub/mangahubio/src/MangaHubIo.kt
rename to src/en/mangahubio/src/eu/kanade/tachiyomi/extension/en/mangahubio/MangaHubIo.kt
diff --git a/src/en/mangairo/build.gradle b/src/en/mangairo/build.gradle
new file mode 100644
index 000000000..5fdaf3882
--- /dev/null
+++ b/src/en/mangairo/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Mangairo'
+ extClass = '.Mangairo'
+ themePkg = 'mangabox'
+ baseUrl = 'https://h.mangairo.com'
+ overrideVersionCode = 4
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangabox/mangairo/res/mipmap-hdpi/ic_launcher.png b/src/en/mangairo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangairo/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangairo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangairo/res/mipmap-mdpi/ic_launcher.png b/src/en/mangairo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangairo/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangairo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangairo/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangairo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangairo/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangairo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangairo/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangairo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangairo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangairo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangairo/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangairo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangairo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangairo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangairo/src/Mangairo.kt b/src/en/mangairo/src/eu/kanade/tachiyomi/extension/en/mangairo/Mangairo.kt
similarity index 100%
rename from multisrc/overrides/mangabox/mangairo/src/Mangairo.kt
rename to src/en/mangairo/src/eu/kanade/tachiyomi/extension/en/mangairo/Mangairo.kt
diff --git a/src/en/mangakakalot/build.gradle b/src/en/mangakakalot/build.gradle
new file mode 100644
index 000000000..18523a010
--- /dev/null
+++ b/src/en/mangakakalot/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangakakalot'
+ extClass = '.Mangakakalot'
+ themePkg = 'mangabox'
+ baseUrl = 'https://mangakakalot.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangabox/mangakakalot/res/mipmap-hdpi/ic_launcher.png b/src/en/mangakakalot/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangakakalot/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangakakalot/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangakakalot/res/mipmap-mdpi/ic_launcher.png b/src/en/mangakakalot/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangakakalot/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangakakalot/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangakakalot/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangakakalot/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangakakalot/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangakakalot/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangakakalot/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangakakalot/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangakakalot/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangakakalot/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangakakalot/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangakakalot/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangakakalot/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangakakalot/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangakakalot/src/Mangakakalot.kt b/src/en/mangakakalot/src/eu/kanade/tachiyomi/extension/en/mangakakalot/Mangakakalot.kt
similarity index 100%
rename from multisrc/overrides/mangabox/mangakakalot/src/Mangakakalot.kt
rename to src/en/mangakakalot/src/eu/kanade/tachiyomi/extension/en/mangakakalot/Mangakakalot.kt
diff --git a/src/en/mangakakalotfun/build.gradle b/src/en/mangakakalotfun/build.gradle
new file mode 100644
index 000000000..c31ba3a90
--- /dev/null
+++ b/src/en/mangakakalotfun/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Mangakakalot.fun'
+ extClass = '.MangakakalotFun'
+ themePkg = 'mangahub'
+ baseUrl = 'https://mangakakalot.fun'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangahub/mangakakalotfun/src/MangakakalotFun.kt b/src/en/mangakakalotfun/src/eu/kanade/tachiyomi/extension/en/mangakakalotfun/MangakakalotFun.kt
similarity index 100%
rename from multisrc/overrides/mangahub/mangakakalotfun/src/MangakakalotFun.kt
rename to src/en/mangakakalotfun/src/eu/kanade/tachiyomi/extension/en/mangakakalotfun/MangakakalotFun.kt
diff --git a/src/en/mangakakalots/build.gradle b/src/en/mangakakalots/build.gradle
new file mode 100644
index 000000000..44ca7d634
--- /dev/null
+++ b/src/en/mangakakalots/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangakakalots (unoriginal)'
+ extClass = '.Mangakakalots'
+ themePkg = 'mangabox'
+ baseUrl = 'https://mangakakalots.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangabox/mangakakalots/res/mipmap-hdpi/ic_launcher.png b/src/en/mangakakalots/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangakakalots/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangakakalots/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangakakalots/res/mipmap-mdpi/ic_launcher.png b/src/en/mangakakalots/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangakakalots/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangakakalots/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangakakalots/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangakakalots/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangakakalots/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangakakalots/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangakakalots/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangakakalots/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangakakalots/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangakakalots/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangakakalots/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangakakalots/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/mangakakalots/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangakakalots/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/mangakakalots/src/Mangakakalots.kt b/src/en/mangakakalots/src/eu/kanade/tachiyomi/extension/en/mangakakalots/Mangakakalots.kt
similarity index 100%
rename from multisrc/overrides/mangabox/mangakakalots/src/Mangakakalots.kt
rename to src/en/mangakakalots/src/eu/kanade/tachiyomi/extension/en/mangakakalots/Mangakakalots.kt
diff --git a/src/en/mangakik/build.gradle b/src/en/mangakik/build.gradle
new file mode 100644
index 000000000..8b106cd58
--- /dev/null
+++ b/src/en/mangakik/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangakik'
+ extClass = '.Mangakik'
+ themePkg = 'madara'
+ baseUrl = 'https://mangakik.org'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangakik/res/mipmap-hdpi/ic_launcher.png b/src/en/mangakik/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakik/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangakik/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakik/res/mipmap-mdpi/ic_launcher.png b/src/en/mangakik/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakik/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangakik/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakik/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangakik/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakik/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangakik/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakik/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangakik/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakik/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangakik/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakik/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangakik/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakik/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangakik/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangakik/src/eu/kanade/tachiyomi/extension/en/mangakik/Mangakik.kt b/src/en/mangakik/src/eu/kanade/tachiyomi/extension/en/mangakik/Mangakik.kt
new file mode 100644
index 000000000..48c01a518
--- /dev/null
+++ b/src/en/mangakik/src/eu/kanade/tachiyomi/extension/en/mangakik/Mangakik.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangakik
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Mangakik : Madara("Mangakik", "https://mangakik.org", "en")
diff --git a/src/en/mangaking/build.gradle b/src/en/mangaking/build.gradle
new file mode 100644
index 000000000..36c47e269
--- /dev/null
+++ b/src/en/mangaking/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaKing'
+ extClass = '.MangaKing'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaking.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaking/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaking/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaking/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaking/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaking/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaking/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaking/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaking/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaking/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaking/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaking/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaking/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaking/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaking/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaking/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaking/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaking/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaking/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaking/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaking/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangaking/src/eu/kanade/tachiyomi/extension/en/mangaking/MangaKing.kt b/src/en/mangaking/src/eu/kanade/tachiyomi/extension/en/mangaking/MangaKing.kt
new file mode 100644
index 000000000..f74686b22
--- /dev/null
+++ b/src/en/mangaking/src/eu/kanade/tachiyomi/extension/en/mangaking/MangaKing.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangaking
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaKing : Madara("MangaKing", "https://mangaking.net", "en")
diff --git a/src/en/mangakiss/build.gradle b/src/en/mangakiss/build.gradle
new file mode 100644
index 000000000..f5f2b6769
--- /dev/null
+++ b/src/en/mangakiss/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Kiss'
+ extClass = '.MangaKiss'
+ themePkg = 'madara'
+ baseUrl = 'https://mangakiss.org'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangakiss/res/mipmap-hdpi/ic_launcher.png b/src/en/mangakiss/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakiss/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangakiss/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakiss/res/mipmap-mdpi/ic_launcher.png b/src/en/mangakiss/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakiss/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangakiss/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakiss/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangakiss/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakiss/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangakiss/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakiss/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangakiss/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakiss/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangakiss/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakiss/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangakiss/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakiss/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangakiss/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangakiss/src/eu/kanade/tachiyomi/extension/en/mangakiss/MangaKiss.kt b/src/en/mangakiss/src/eu/kanade/tachiyomi/extension/en/mangakiss/MangaKiss.kt
new file mode 100644
index 000000000..f8a66c2be
--- /dev/null
+++ b/src/en/mangakiss/src/eu/kanade/tachiyomi/extension/en/mangakiss/MangaKiss.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangakiss
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaKiss : Madara("Manga Kiss", "https://mangakiss.org", "en")
diff --git a/src/en/mangakitsu/build.gradle b/src/en/mangakitsu/build.gradle
new file mode 100644
index 000000000..7df0fcef1
--- /dev/null
+++ b/src/en/mangakitsu/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Kitsu'
+ extClass = '.MangaKitsu'
+ themePkg = 'madara'
+ baseUrl = 'https://mangakitsu.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangakitsu/src/MangaKitsu.kt b/src/en/mangakitsu/src/eu/kanade/tachiyomi/extension/en/mangakitsu/MangaKitsu.kt
similarity index 100%
rename from multisrc/overrides/madara/mangakitsu/src/MangaKitsu.kt
rename to src/en/mangakitsu/src/eu/kanade/tachiyomi/extension/en/mangakitsu/MangaKitsu.kt
diff --git a/src/en/mangakitsune/build.gradle b/src/en/mangakitsune/build.gradle
new file mode 100644
index 000000000..41fb0cfc0
--- /dev/null
+++ b/src/en/mangakitsune/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaKitsune'
+ extClass = '.MangaKitsune'
+ themePkg = 'madara'
+ baseUrl = 'https://mangakitsune.com'
+ overrideVersionCode = 4
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangakitsune/res/mipmap-hdpi/ic_launcher.png b/src/en/mangakitsune/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakitsune/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangakitsune/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakitsune/res/mipmap-mdpi/ic_launcher.png b/src/en/mangakitsune/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakitsune/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangakitsune/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakitsune/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangakitsune/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakitsune/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangakitsune/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakitsune/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangakitsune/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakitsune/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangakitsune/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakitsune/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangakitsune/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakitsune/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangakitsune/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt b/src/en/mangakitsune/src/eu/kanade/tachiyomi/extension/en/mangakitsune/MangaKitsune.kt
similarity index 100%
rename from multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt
rename to src/en/mangakitsune/src/eu/kanade/tachiyomi/extension/en/mangakitsune/MangaKitsune.kt
diff --git a/src/en/mangakomi/build.gradle b/src/en/mangakomi/build.gradle
new file mode 100644
index 000000000..732366142
--- /dev/null
+++ b/src/en/mangakomi/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaKomi'
+ extClass = '.MangaKomi'
+ themePkg = 'madara'
+ baseUrl = 'https://mangakomi.io'
+ overrideVersionCode = 5
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangakomi/res/mipmap-hdpi/ic_launcher.png b/src/en/mangakomi/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakomi/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangakomi/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakomi/res/mipmap-mdpi/ic_launcher.png b/src/en/mangakomi/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakomi/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangakomi/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakomi/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangakomi/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakomi/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangakomi/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakomi/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangakomi/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakomi/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangakomi/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakomi/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangakomi/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakomi/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangakomi/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakomi/src/MangaKomi.kt b/src/en/mangakomi/src/eu/kanade/tachiyomi/extension/en/mangakomi/MangaKomi.kt
similarity index 100%
rename from multisrc/overrides/madara/mangakomi/src/MangaKomi.kt
rename to src/en/mangakomi/src/eu/kanade/tachiyomi/extension/en/mangakomi/MangaKomi.kt
diff --git a/src/en/mangaleveling/build.gradle b/src/en/mangaleveling/build.gradle
new file mode 100644
index 000000000..011f2cb5a
--- /dev/null
+++ b/src/en/mangaleveling/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Leveling'
+ extClass = '.MangaLeveling'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaleveling.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaleveling/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaleveling/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaleveling/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaleveling/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaleveling/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaleveling/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaleveling/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaleveling/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaleveling/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaleveling/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaleveling/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaleveling/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaleveling/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaleveling/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaleveling/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaleveling/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaleveling/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaleveling/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaleveling/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaleveling/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaleveling/src/MangaLeveling.kt b/src/en/mangaleveling/src/eu/kanade/tachiyomi/extension/en/mangaleveling/MangaLeveling.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaleveling/src/MangaLeveling.kt
rename to src/en/mangaleveling/src/eu/kanade/tachiyomi/extension/en/mangaleveling/MangaLeveling.kt
diff --git a/src/en/mangalife/build.gradle b/src/en/mangalife/build.gradle
new file mode 100644
index 000000000..98b2494c6
--- /dev/null
+++ b/src/en/mangalife/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaLife'
+ extClass = '.MangaLife'
+ themePkg = 'nepnep'
+ baseUrl = 'https://manga4life.com'
+ overrideVersionCode = 16
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/nepnep/mangalife/res/mipmap-hdpi/ic_launcher.png b/src/en/mangalife/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/nepnep/mangalife/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangalife/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/nepnep/mangalife/res/mipmap-mdpi/ic_launcher.png b/src/en/mangalife/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/nepnep/mangalife/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangalife/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/nepnep/mangalife/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangalife/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/nepnep/mangalife/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangalife/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/nepnep/mangalife/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangalife/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/nepnep/mangalife/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangalife/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/nepnep/mangalife/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangalife/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/nepnep/mangalife/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangalife/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/nepnep/mangalife/src/MangaLife.kt b/src/en/mangalife/src/eu/kanade/tachiyomi/extension/en/mangalife/MangaLife.kt
similarity index 100%
rename from multisrc/overrides/nepnep/mangalife/src/MangaLife.kt
rename to src/en/mangalife/src/eu/kanade/tachiyomi/extension/en/mangalife/MangaLife.kt
diff --git a/src/en/mangamaniacs/build.gradle b/src/en/mangamaniacs/build.gradle
new file mode 100644
index 000000000..4ef177d21
--- /dev/null
+++ b/src/en/mangamaniacs/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaManiacs'
+ extClass = '.MangaManiacs'
+ themePkg = 'madara'
+ baseUrl = 'https://mangamaniacs.org'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangamaniacs/res/mipmap-hdpi/ic_launcher.png b/src/en/mangamaniacs/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamaniacs/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangamaniacs/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamaniacs/res/mipmap-mdpi/ic_launcher.png b/src/en/mangamaniacs/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamaniacs/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangamaniacs/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamaniacs/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangamaniacs/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamaniacs/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangamaniacs/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamaniacs/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangamaniacs/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamaniacs/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangamaniacs/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamaniacs/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangamaniacs/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamaniacs/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangamaniacs/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangamaniacs/src/eu/kanade/tachiyomi/extension/en/mangamaniacs/MangaManiacs.kt b/src/en/mangamaniacs/src/eu/kanade/tachiyomi/extension/en/mangamaniacs/MangaManiacs.kt
new file mode 100644
index 000000000..d125c5da2
--- /dev/null
+++ b/src/en/mangamaniacs/src/eu/kanade/tachiyomi/extension/en/mangamaniacs/MangaManiacs.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangamaniacs
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaManiacs : Madara("MangaManiacs", "https://mangamaniacs.org", "en")
diff --git a/src/en/mangamitsu/build.gradle b/src/en/mangamitsu/build.gradle
new file mode 100644
index 000000000..4aea8b4b0
--- /dev/null
+++ b/src/en/mangamitsu/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga Mitsu'
+ extClass = '.MangaMitsu'
+ themePkg = 'madara'
+ baseUrl = 'https://mangamitsu.com'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangamitsu/res/mipmap-hdpi/ic_launcher.png b/src/en/mangamitsu/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamitsu/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangamitsu/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamitsu/res/mipmap-mdpi/ic_launcher.png b/src/en/mangamitsu/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamitsu/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangamitsu/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamitsu/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangamitsu/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamitsu/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangamitsu/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamitsu/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangamitsu/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamitsu/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangamitsu/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamitsu/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangamitsu/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamitsu/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangamitsu/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangamitsu/src/eu/kanade/tachiyomi/extension/en/mangamitsu/MangaMitsu.kt b/src/en/mangamitsu/src/eu/kanade/tachiyomi/extension/en/mangamitsu/MangaMitsu.kt
new file mode 100644
index 000000000..f73b2fca9
--- /dev/null
+++ b/src/en/mangamitsu/src/eu/kanade/tachiyomi/extension/en/mangamitsu/MangaMitsu.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangamitsu
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaMitsu : Madara("Manga Mitsu", "https://mangamitsu.com", "en")
diff --git a/src/en/manganel/build.gradle b/src/en/manganel/build.gradle
new file mode 100644
index 000000000..169410074
--- /dev/null
+++ b/src/en/manganel/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaNel'
+ extClass = '.MangaNel'
+ themePkg = 'mangahub'
+ baseUrl = 'https://manganel.me'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangahub/manganel/src/MangaNel.kt b/src/en/manganel/src/eu/kanade/tachiyomi/extension/en/manganel/MangaNel.kt
similarity index 100%
rename from multisrc/overrides/mangahub/manganel/src/MangaNel.kt
rename to src/en/manganel/src/eu/kanade/tachiyomi/extension/en/manganel/MangaNel.kt
diff --git a/src/en/manganelo/build.gradle b/src/en/manganelo/build.gradle
new file mode 100644
index 000000000..d34b6c9a1
--- /dev/null
+++ b/src/en/manganelo/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manganato'
+ extClass = '.Manganato'
+ themePkg = 'mangabox'
+ baseUrl = 'https://manganato.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangabox/manganelo/res/mipmap-hdpi/ic_launcher.png b/src/en/manganelo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/manganelo/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manganelo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/manganelo/res/mipmap-mdpi/ic_launcher.png b/src/en/manganelo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/manganelo/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manganelo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/manganelo/res/mipmap-xhdpi/ic_launcher.png b/src/en/manganelo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/manganelo/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manganelo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/manganelo/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manganelo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/manganelo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manganelo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/manganelo/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manganelo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangabox/manganelo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manganelo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangabox/manganelo/src/Manganato.kt b/src/en/manganelo/src/eu/kanade/tachiyomi/extension/en/manganelo/Manganato.kt
similarity index 100%
rename from multisrc/overrides/mangabox/manganelo/src/Manganato.kt
rename to src/en/manganelo/src/eu/kanade/tachiyomi/extension/en/manganelo/Manganato.kt
diff --git a/src/en/manganelobiz/build.gradle b/src/en/manganelobiz/build.gradle
new file mode 100644
index 000000000..aa2ae293a
--- /dev/null
+++ b/src/en/manganelobiz/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manganelo.biz'
+ extClass = '.ManganeloBiz'
+ themePkg = 'madara'
+ baseUrl = 'https://manganelo.biz'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manganelobiz/res/mipmap-hdpi/ic_launcher.png b/src/en/manganelobiz/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganelobiz/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manganelobiz/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganelobiz/res/mipmap-mdpi/ic_launcher.png b/src/en/manganelobiz/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganelobiz/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manganelobiz/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganelobiz/res/mipmap-xhdpi/ic_launcher.png b/src/en/manganelobiz/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganelobiz/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manganelobiz/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganelobiz/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manganelobiz/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganelobiz/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manganelobiz/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganelobiz/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manganelobiz/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganelobiz/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manganelobiz/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganelobiz/src/ManganeloBiz.kt b/src/en/manganelobiz/src/eu/kanade/tachiyomi/extension/en/manganelobiz/ManganeloBiz.kt
similarity index 100%
rename from multisrc/overrides/madara/manganelobiz/src/ManganeloBiz.kt
rename to src/en/manganelobiz/src/eu/kanade/tachiyomi/extension/en/manganelobiz/ManganeloBiz.kt
diff --git a/src/en/manganeloscom/build.gradle b/src/en/manganeloscom/build.gradle
new file mode 100644
index 000000000..35c2197c2
--- /dev/null
+++ b/src/en/manganeloscom/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaNelos.com'
+ extClass = '.MangaNelosCom'
+ themePkg = 'paprika'
+ baseUrl = 'http://manganelos.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/paprika/manganeloscom/res/mipmap-hdpi/ic_launcher.png b/src/en/manganeloscom/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/manganeloscom/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manganeloscom/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/paprika/manganeloscom/res/mipmap-mdpi/ic_launcher.png b/src/en/manganeloscom/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/manganeloscom/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manganeloscom/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/paprika/manganeloscom/res/mipmap-xhdpi/ic_launcher.png b/src/en/manganeloscom/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/manganeloscom/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manganeloscom/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/paprika/manganeloscom/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manganeloscom/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/manganeloscom/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manganeloscom/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/paprika/manganeloscom/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manganeloscom/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/manganeloscom/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manganeloscom/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/manganeloscom/src/eu/kanade/tachiyomi/extension/en/manganeloscom/MangaNelosCom.kt b/src/en/manganeloscom/src/eu/kanade/tachiyomi/extension/en/manganeloscom/MangaNelosCom.kt
new file mode 100644
index 000000000..5a36565d8
--- /dev/null
+++ b/src/en/manganeloscom/src/eu/kanade/tachiyomi/extension/en/manganeloscom/MangaNelosCom.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.manganeloscom
+
+import eu.kanade.tachiyomi.multisrc.paprika.Paprika
+
+class MangaNelosCom : Paprika("MangaNelos.com", "http://manganelos.com", "en")
diff --git a/src/en/manganelowebsite/build.gradle b/src/en/manganelowebsite/build.gradle
new file mode 100644
index 000000000..71ac05250
--- /dev/null
+++ b/src/en/manganelowebsite/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manganelo.website (unoriginal)'
+ extClass = '.ManganeloWebsite'
+ themePkg = 'madara'
+ baseUrl = 'https://manganelo.website'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manganelowebsite/res/mipmap-hdpi/ic_launcher.png b/src/en/manganelowebsite/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganelowebsite/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manganelowebsite/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganelowebsite/res/mipmap-mdpi/ic_launcher.png b/src/en/manganelowebsite/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganelowebsite/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manganelowebsite/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganelowebsite/res/mipmap-xhdpi/ic_launcher.png b/src/en/manganelowebsite/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganelowebsite/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manganelowebsite/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganelowebsite/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manganelowebsite/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganelowebsite/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manganelowebsite/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganelowebsite/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manganelowebsite/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganelowebsite/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manganelowebsite/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganelowebsite/src/ManganeloWebsite.kt b/src/en/manganelowebsite/src/eu/kanade/tachiyomi/extension/en/manganelowebsite/ManganeloWebsite.kt
similarity index 100%
rename from multisrc/overrides/madara/manganelowebsite/src/ManganeloWebsite.kt
rename to src/en/manganelowebsite/src/eu/kanade/tachiyomi/extension/en/manganelowebsite/ManganeloWebsite.kt
diff --git a/src/en/manganerds/build.gradle b/src/en/manganerds/build.gradle
new file mode 100644
index 000000000..11d5689b8
--- /dev/null
+++ b/src/en/manganerds/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Nerds'
+ extClass = '.MangaNerds'
+ themePkg = 'madara'
+ baseUrl = 'https://manganerds.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manganerds/res/mipmap-hdpi/ic_launcher.png b/src/en/manganerds/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganerds/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manganerds/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganerds/res/mipmap-mdpi/ic_launcher.png b/src/en/manganerds/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganerds/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manganerds/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganerds/res/mipmap-xhdpi/ic_launcher.png b/src/en/manganerds/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganerds/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manganerds/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganerds/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manganerds/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganerds/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manganerds/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganerds/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manganerds/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manganerds/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manganerds/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manganerds/src/MangaNerds.kt b/src/en/manganerds/src/eu/kanade/tachiyomi/extension/en/manganerds/MangaNerds.kt
similarity index 100%
rename from multisrc/overrides/madara/manganerds/src/MangaNerds.kt
rename to src/en/manganerds/src/eu/kanade/tachiyomi/extension/en/manganerds/MangaNerds.kt
diff --git a/src/en/mangaonlinefun/build.gradle b/src/en/mangaonlinefun/build.gradle
new file mode 100644
index 000000000..14c1c1f78
--- /dev/null
+++ b/src/en/mangaonlinefun/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaOnline.fun'
+ extClass = '.MangaOnlineFun'
+ themePkg = 'mangahub'
+ baseUrl = 'https://mangaonline.fun'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangahub/mangaonlinefun/src/MangaOnlineFun.kt b/src/en/mangaonlinefun/src/eu/kanade/tachiyomi/extension/en/mangaonlinefun/MangaOnlineFun.kt
similarity index 100%
rename from multisrc/overrides/mangahub/mangaonlinefun/src/MangaOnlineFun.kt
rename to src/en/mangaonlinefun/src/eu/kanade/tachiyomi/extension/en/mangaonlinefun/MangaOnlineFun.kt
diff --git a/src/en/mangaonlineteam/build.gradle b/src/en/mangaonlineteam/build.gradle
new file mode 100644
index 000000000..cc3dca7f2
--- /dev/null
+++ b/src/en/mangaonlineteam/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Online Team'
+ extClass = '.MangaOnlineTeam'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaonlineteam.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaonlineteam/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaonlineteam/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonlineteam/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaonlineteam/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonlineteam/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaonlineteam/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonlineteam/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaonlineteam/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonlineteam/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaonlineteam/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonlineteam/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaonlineteam/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonlineteam/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaonlineteam/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonlineteam/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaonlineteam/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonlineteam/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaonlineteam/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonlineteam/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaonlineteam/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangaonlineteam/src/eu/kanade/tachiyomi/extension/en/mangaonlineteam/MangaOnlineTeam.kt b/src/en/mangaonlineteam/src/eu/kanade/tachiyomi/extension/en/mangaonlineteam/MangaOnlineTeam.kt
new file mode 100644
index 000000000..4985b7a0f
--- /dev/null
+++ b/src/en/mangaonlineteam/src/eu/kanade/tachiyomi/extension/en/mangaonlineteam/MangaOnlineTeam.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangaonlineteam
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaOnlineTeam : Madara("Manga Online Team", "https://mangaonlineteam.com", "en")
diff --git a/src/en/mangaonlineteamunoriginal/build.gradle b/src/en/mangaonlineteamunoriginal/build.gradle
new file mode 100644
index 000000000..a343150d3
--- /dev/null
+++ b/src/en/mangaonlineteamunoriginal/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaOnline.team (unoriginal)'
+ extClass = '.MangaOnlineTeamUnoriginal'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaonline.team'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaonlineteamunoriginal/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaonlineteamunoriginal/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonlineteamunoriginal/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaonlineteamunoriginal/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonlineteamunoriginal/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaonlineteamunoriginal/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonlineteamunoriginal/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaonlineteamunoriginal/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonlineteamunoriginal/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaonlineteamunoriginal/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonlineteamunoriginal/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaonlineteamunoriginal/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonlineteamunoriginal/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaonlineteamunoriginal/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonlineteamunoriginal/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaonlineteamunoriginal/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonlineteamunoriginal/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaonlineteamunoriginal/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonlineteamunoriginal/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaonlineteamunoriginal/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonlineteamunoriginal/src/MangaOnlineTeamUnoriginal.kt b/src/en/mangaonlineteamunoriginal/src/eu/kanade/tachiyomi/extension/en/mangaonlineteamunoriginal/MangaOnlineTeamUnoriginal.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaonlineteamunoriginal/src/MangaOnlineTeamUnoriginal.kt
rename to src/en/mangaonlineteamunoriginal/src/eu/kanade/tachiyomi/extension/en/mangaonlineteamunoriginal/MangaOnlineTeamUnoriginal.kt
diff --git a/src/en/mangaowlblog/build.gradle b/src/en/mangaowlblog/build.gradle
new file mode 100644
index 000000000..60a49b08a
--- /dev/null
+++ b/src/en/mangaowlblog/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaOwl.blog (unoriginal)'
+ extClass = '.MangaOwlBlog'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaowl.blog'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaowlblog/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaowlblog/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlblog/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaowlblog/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlblog/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaowlblog/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlblog/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaowlblog/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlblog/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaowlblog/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlblog/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaowlblog/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlblog/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaowlblog/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlblog/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaowlblog/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlblog/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaowlblog/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlblog/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaowlblog/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlblog/src/MangaOwlBlog.kt b/src/en/mangaowlblog/src/eu/kanade/tachiyomi/extension/en/mangaowlblog/MangaOwlBlog.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaowlblog/src/MangaOwlBlog.kt
rename to src/en/mangaowlblog/src/eu/kanade/tachiyomi/extension/en/mangaowlblog/MangaOwlBlog.kt
diff --git a/src/en/mangaowlio/build.gradle b/src/en/mangaowlio/build.gradle
new file mode 100644
index 000000000..ce675bc37
--- /dev/null
+++ b/src/en/mangaowlio/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaOwl.io (unoriginal)'
+ extClass = '.MangaOwlIo'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaowl.io'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaowlio/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaowlio/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlio/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaowlio/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlio/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaowlio/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlio/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaowlio/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlio/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaowlio/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlio/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaowlio/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlio/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaowlio/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlio/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaowlio/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlio/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaowlio/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlio/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaowlio/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlio/src/MangaOwlIo.kt b/src/en/mangaowlio/src/eu/kanade/tachiyomi/extension/en/mangaowlio/MangaOwlIo.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaowlio/src/MangaOwlIo.kt
rename to src/en/mangaowlio/src/eu/kanade/tachiyomi/extension/en/mangaowlio/MangaOwlIo.kt
diff --git a/src/en/mangaowlone/build.gradle b/src/en/mangaowlone/build.gradle
new file mode 100644
index 000000000..781a70711
--- /dev/null
+++ b/src/en/mangaowlone/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaOwl.one (unoriginal)'
+ extClass = '.MangaOwlOne'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaowl.one'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaowlone/src/MangaOwlOne.kt b/src/en/mangaowlone/src/eu/kanade/tachiyomi/extension/en/mangaowlone/MangaOwlOne.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaowlone/src/MangaOwlOne.kt
rename to src/en/mangaowlone/src/eu/kanade/tachiyomi/extension/en/mangaowlone/MangaOwlOne.kt
diff --git a/src/en/mangaowlus/build.gradle b/src/en/mangaowlus/build.gradle
new file mode 100644
index 000000000..1982be576
--- /dev/null
+++ b/src/en/mangaowlus/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaOwl.us (unoriginal)'
+ extClass = '.MangaOwlUs'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaowl.us'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaowlus/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaowlus/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlus/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaowlus/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlus/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaowlus/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlus/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaowlus/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlus/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaowlus/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlus/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaowlus/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlus/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaowlus/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlus/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaowlus/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlus/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaowlus/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaowlus/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaowlus/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaowlus/src/MangaOwlUs.kt b/src/en/mangaowlus/src/eu/kanade/tachiyomi/extension/en/mangaowlus/MangaOwlUs.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaowlus/src/MangaOwlUs.kt
rename to src/en/mangaowlus/src/eu/kanade/tachiyomi/extension/en/mangaowlus/MangaOwlUs.kt
diff --git a/src/en/mangapandaonl/build.gradle b/src/en/mangapandaonl/build.gradle
new file mode 100644
index 000000000..6db95c41f
--- /dev/null
+++ b/src/en/mangapandaonl/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaPanda.onl'
+ extClass = '.MangaPandaOnl'
+ themePkg = 'mangahub'
+ baseUrl = 'https://mangapanda.onl'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangahub/mangapandaonl/res/mipmap-hdpi/ic_launcher.png b/src/en/mangapandaonl/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangapandaonl/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangapandaonl/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangapandaonl/res/mipmap-mdpi/ic_launcher.png b/src/en/mangapandaonl/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangapandaonl/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangapandaonl/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangapandaonl/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangapandaonl/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangapandaonl/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangapandaonl/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangapandaonl/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangapandaonl/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangapandaonl/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangapandaonl/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangapandaonl/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangapandaonl/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangapandaonl/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangapandaonl/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangapandaonl/src/MangaPandaOnl.kt b/src/en/mangapandaonl/src/eu/kanade/tachiyomi/extension/en/mangapandaonl/MangaPandaOnl.kt
similarity index 100%
rename from multisrc/overrides/mangahub/mangapandaonl/src/MangaPandaOnl.kt
rename to src/en/mangapandaonl/src/eu/kanade/tachiyomi/extension/en/mangapandaonl/MangaPandaOnl.kt
diff --git a/src/en/mangapuma/build.gradle b/src/en/mangapuma/build.gradle
new file mode 100644
index 000000000..823cbbe00
--- /dev/null
+++ b/src/en/mangapuma/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaPuma'
+ extClass = '.MangaPuma'
+ themePkg = 'madtheme'
+ baseUrl = 'https://mangapuma.com'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madtheme/mangapuma/res/mipmap-hdpi/ic_launcher.png b/src/en/mangapuma/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangapuma/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangapuma/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangapuma/res/mipmap-mdpi/ic_launcher.png b/src/en/mangapuma/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangapuma/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangapuma/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangapuma/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangapuma/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangapuma/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangapuma/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangapuma/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangapuma/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangapuma/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangapuma/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangapuma/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangapuma/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangapuma/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangapuma/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangapuma/src/MangaPuma.kt b/src/en/mangapuma/src/eu/kanade/tachiyomi/extension/en/mangapuma/MangaPuma.kt
similarity index 100%
rename from multisrc/overrides/madtheme/mangapuma/src/MangaPuma.kt
rename to src/en/mangapuma/src/eu/kanade/tachiyomi/extension/en/mangapuma/MangaPuma.kt
diff --git a/src/en/mangapure/build.gradle b/src/en/mangapure/build.gradle
new file mode 100644
index 000000000..fdefb27e3
--- /dev/null
+++ b/src/en/mangapure/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaPure'
+ extClass = '.MangaPure'
+ themePkg = 'madara'
+ baseUrl = 'https://mangapure.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangapure/res/mipmap-hdpi/ic_launcher.png b/src/en/mangapure/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangapure/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangapure/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangapure/res/mipmap-mdpi/ic_launcher.png b/src/en/mangapure/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangapure/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangapure/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangapure/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangapure/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangapure/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangapure/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangapure/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangapure/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangapure/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangapure/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangapure/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangapure/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangapure/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangapure/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangapure/src/MangaPure.kt b/src/en/mangapure/src/eu/kanade/tachiyomi/extension/en/mangapure/MangaPure.kt
similarity index 100%
rename from multisrc/overrides/madara/mangapure/src/MangaPure.kt
rename to src/en/mangapure/src/eu/kanade/tachiyomi/extension/en/mangapure/MangaPure.kt
diff --git a/src/en/mangaqueen/build.gradle b/src/en/mangaqueen/build.gradle
new file mode 100644
index 000000000..f210434fd
--- /dev/null
+++ b/src/en/mangaqueen/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Queen'
+ extClass = '.MangaQueen'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaqueen.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaqueen/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaqueen/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaqueen/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaqueen/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaqueen/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaqueen/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaqueen/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaqueen/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaqueen/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaqueen/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaqueen/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaqueen/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaqueen/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaqueen/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaqueen/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaqueen/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaqueen/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaqueen/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaqueen/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaqueen/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaqueen/src/MangaQueen.kt b/src/en/mangaqueen/src/eu/kanade/tachiyomi/extension/en/mangaqueen/MangaQueen.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaqueen/src/MangaQueen.kt
rename to src/en/mangaqueen/src/eu/kanade/tachiyomi/extension/en/mangaqueen/MangaQueen.kt
diff --git a/src/en/mangaqueencom/build.gradle b/src/en/mangaqueencom/build.gradle
new file mode 100644
index 000000000..314fe3d40
--- /dev/null
+++ b/src/en/mangaqueencom/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga Queen.com'
+ extClass = '.MangaQueenCom'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaqueen.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaqueencom/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaqueencom/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaqueencom/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaqueencom/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaqueencom/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaqueencom/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaqueencom/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaqueencom/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaqueencom/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaqueencom/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaqueencom/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaqueencom/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaqueencom/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaqueencom/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaqueencom/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaqueencom/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaqueencom/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaqueencom/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaqueencom/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaqueencom/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaqueencom/src/MangaQueenCom.kt b/src/en/mangaqueencom/src/eu/kanade/tachiyomi/extension/en/mangaqueencom/MangaQueenCom.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaqueencom/src/MangaQueenCom.kt
rename to src/en/mangaqueencom/src/eu/kanade/tachiyomi/extension/en/mangaqueencom/MangaQueenCom.kt
diff --git a/src/en/mangarawinfo/build.gradle b/src/en/mangarawinfo/build.gradle
new file mode 100644
index 000000000..a5d914d87
--- /dev/null
+++ b/src/en/mangarawinfo/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga-Raw.info (unoriginal)'
+ extClass = '.MangaRawInfo'
+ themePkg = 'madara'
+ baseUrl = 'https://manga-raw.info'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangarawinfo/res/mipmap-hdpi/ic_launcher.png b/src/en/mangarawinfo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarawinfo/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangarawinfo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarawinfo/res/mipmap-mdpi/ic_launcher.png b/src/en/mangarawinfo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarawinfo/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangarawinfo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarawinfo/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangarawinfo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarawinfo/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangarawinfo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarawinfo/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangarawinfo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarawinfo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangarawinfo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarawinfo/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangarawinfo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarawinfo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangarawinfo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarawinfo/src/MangaRawInfo.kt b/src/en/mangarawinfo/src/eu/kanade/tachiyomi/extension/en/mangarawinfo/MangaRawInfo.kt
similarity index 100%
rename from multisrc/overrides/madara/mangarawinfo/src/MangaRawInfo.kt
rename to src/en/mangarawinfo/src/eu/kanade/tachiyomi/extension/en/mangarawinfo/MangaRawInfo.kt
diff --git a/src/en/mangaread/build.gradle b/src/en/mangaread/build.gradle
new file mode 100644
index 000000000..3e52a9fc4
--- /dev/null
+++ b/src/en/mangaread/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Read'
+ extClass = '.MangaRead'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaread.co'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaread/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaread/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaread/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaread/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaread/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaread/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaread/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaread/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaread/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaread/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaread/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaread/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaread/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaread/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaread/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaread/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaread/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaread/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaread/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaread/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaread/src/MangaRead.kt b/src/en/mangaread/src/eu/kanade/tachiyomi/extension/en/mangaread/MangaRead.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaread/src/MangaRead.kt
rename to src/en/mangaread/src/eu/kanade/tachiyomi/extension/en/mangaread/MangaRead.kt
diff --git a/src/en/mangareadercc/build.gradle b/src/en/mangareadercc/build.gradle
new file mode 100644
index 000000000..c2c7f7a4f
--- /dev/null
+++ b/src/en/mangareadercc/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaReader.cc'
+ extClass = '.MangaReaderCC'
+ themePkg = 'paprika'
+ baseUrl = 'http://mangareader.cc'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/paprika/mangareadercc/res/mipmap-hdpi/ic_launcher.png b/src/en/mangareadercc/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/mangareadercc/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangareadercc/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/paprika/mangareadercc/res/mipmap-mdpi/ic_launcher.png b/src/en/mangareadercc/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/mangareadercc/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangareadercc/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/paprika/mangareadercc/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangareadercc/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/mangareadercc/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangareadercc/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/paprika/mangareadercc/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangareadercc/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/mangareadercc/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangareadercc/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/paprika/mangareadercc/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangareadercc/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/paprika/mangareadercc/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangareadercc/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangareadercc/src/eu/kanade/tachiyomi/extension/en/mangareadercc/MangaReaderCC.kt b/src/en/mangareadercc/src/eu/kanade/tachiyomi/extension/en/mangareadercc/MangaReaderCC.kt
new file mode 100644
index 000000000..00d41a797
--- /dev/null
+++ b/src/en/mangareadercc/src/eu/kanade/tachiyomi/extension/en/mangareadercc/MangaReaderCC.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangareadercc
+
+import eu.kanade.tachiyomi.multisrc.paprika.PaprikaAlt
+
+class MangaReaderCC : PaprikaAlt("MangaReader.cc", "http://mangareader.cc", "en")
diff --git a/src/en/mangareadersite/build.gradle b/src/en/mangareadersite/build.gradle
new file mode 100644
index 000000000..481bd692f
--- /dev/null
+++ b/src/en/mangareadersite/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaReader.site'
+ extClass = '.MangaReaderSite'
+ themePkg = 'mangahub'
+ baseUrl = 'https://mangareader.site'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangahub/mangareadersite/res/mipmap-hdpi/ic_launcher.png b/src/en/mangareadersite/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangareadersite/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangareadersite/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangareadersite/res/mipmap-mdpi/ic_launcher.png b/src/en/mangareadersite/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangareadersite/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangareadersite/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangareadersite/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangareadersite/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangareadersite/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangareadersite/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangareadersite/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangareadersite/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangareadersite/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangareadersite/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangareadersite/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangareadersite/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangahub/mangareadersite/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangareadersite/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangahub/mangareadersite/src/MangaReaderSite.kt b/src/en/mangareadersite/src/eu/kanade/tachiyomi/extension/en/mangareadersite/MangaReaderSite.kt
similarity index 100%
rename from multisrc/overrides/mangahub/mangareadersite/src/MangaReaderSite.kt
rename to src/en/mangareadersite/src/eu/kanade/tachiyomi/extension/en/mangareadersite/MangaReaderSite.kt
diff --git a/src/en/mangareadorg/build.gradle b/src/en/mangareadorg/build.gradle
new file mode 100644
index 000000000..b4074ec9e
--- /dev/null
+++ b/src/en/mangareadorg/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaRead.org'
+ extClass = '.MangaReadOrg'
+ themePkg = 'madara'
+ baseUrl = 'https://www.mangaread.org'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangareadorg/res/mipmap-hdpi/ic_launcher.png b/src/en/mangareadorg/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangareadorg/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangareadorg/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangareadorg/res/mipmap-mdpi/ic_launcher.png b/src/en/mangareadorg/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangareadorg/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangareadorg/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangareadorg/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangareadorg/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangareadorg/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangareadorg/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangareadorg/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangareadorg/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangareadorg/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangareadorg/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangareadorg/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangareadorg/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangareadorg/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangareadorg/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangareadorg/src/MangaReadOrg.kt b/src/en/mangareadorg/src/eu/kanade/tachiyomi/extension/en/mangareadorg/MangaReadOrg.kt
similarity index 100%
rename from multisrc/overrides/madara/mangareadorg/src/MangaReadOrg.kt
rename to src/en/mangareadorg/src/eu/kanade/tachiyomi/extension/en/mangareadorg/MangaReadOrg.kt
diff --git a/src/en/mangarockteam/build.gradle b/src/en/mangarockteam/build.gradle
new file mode 100644
index 000000000..3617663f0
--- /dev/null
+++ b/src/en/mangarockteam/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Rock Team'
+ extClass = '.MangaRockTeam'
+ themePkg = 'madara'
+ baseUrl = 'https://mangarockteam.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangarockteam/res/mipmap-hdpi/ic_launcher.png b/src/en/mangarockteam/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarockteam/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangarockteam/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarockteam/res/mipmap-mdpi/ic_launcher.png b/src/en/mangarockteam/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarockteam/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangarockteam/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarockteam/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangarockteam/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarockteam/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangarockteam/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarockteam/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangarockteam/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarockteam/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangarockteam/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarockteam/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangarockteam/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarockteam/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangarockteam/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangarockteam/src/eu/kanade/tachiyomi/extension/en/mangarockteam/MangaRockTeam.kt b/src/en/mangarockteam/src/eu/kanade/tachiyomi/extension/en/mangarockteam/MangaRockTeam.kt
new file mode 100644
index 000000000..5b1d04d25
--- /dev/null
+++ b/src/en/mangarockteam/src/eu/kanade/tachiyomi/extension/en/mangarockteam/MangaRockTeam.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangarockteam
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaRockTeam : Madara("Manga Rock Team", "https://mangarockteam.com", "en")
diff --git a/src/en/mangarockteamunoriginal/build.gradle b/src/en/mangarockteamunoriginal/build.gradle
new file mode 100644
index 000000000..2a02b45cd
--- /dev/null
+++ b/src/en/mangarockteamunoriginal/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Rock.team (unoriginal)'
+ extClass = '.MangaRockTeamUnoriginal'
+ themePkg = 'madara'
+ baseUrl = 'https://mangarock.team'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangarockteamunoriginal/res/mipmap-hdpi/ic_launcher.png b/src/en/mangarockteamunoriginal/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarockteamunoriginal/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangarockteamunoriginal/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarockteamunoriginal/res/mipmap-mdpi/ic_launcher.png b/src/en/mangarockteamunoriginal/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarockteamunoriginal/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangarockteamunoriginal/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarockteamunoriginal/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangarockteamunoriginal/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarockteamunoriginal/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangarockteamunoriginal/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarockteamunoriginal/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangarockteamunoriginal/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarockteamunoriginal/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangarockteamunoriginal/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarockteamunoriginal/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangarockteamunoriginal/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarockteamunoriginal/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangarockteamunoriginal/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarockteamunoriginal/src/MangaRockTeamUnoriginal.kt b/src/en/mangarockteamunoriginal/src/eu/kanade/tachiyomi/extension/en/mangarockteamunoriginal/MangaRockTeamUnoriginal.kt
similarity index 100%
rename from multisrc/overrides/madara/mangarockteamunoriginal/src/MangaRockTeamUnoriginal.kt
rename to src/en/mangarockteamunoriginal/src/eu/kanade/tachiyomi/extension/en/mangarockteamunoriginal/MangaRockTeamUnoriginal.kt
diff --git a/src/en/mangarocky/build.gradle b/src/en/mangarocky/build.gradle
new file mode 100644
index 000000000..e259d60e8
--- /dev/null
+++ b/src/en/mangarocky/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Rocky'
+ extClass = '.MangaRocky'
+ themePkg = 'madara'
+ baseUrl = 'https://mangarocky.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangarocky/res/mipmap-hdpi/ic_launcher.png b/src/en/mangarocky/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarocky/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangarocky/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarocky/res/mipmap-mdpi/ic_launcher.png b/src/en/mangarocky/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarocky/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangarocky/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarocky/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangarocky/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarocky/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangarocky/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarocky/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangarocky/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarocky/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangarocky/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarocky/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangarocky/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarocky/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangarocky/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangarocky/src/eu/kanade/tachiyomi/extension/en/mangarocky/MangaRocky.kt b/src/en/mangarocky/src/eu/kanade/tachiyomi/extension/en/mangarocky/MangaRocky.kt
new file mode 100644
index 000000000..a3ab976da
--- /dev/null
+++ b/src/en/mangarocky/src/eu/kanade/tachiyomi/extension/en/mangarocky/MangaRocky.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangarocky
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaRocky : Madara("Manga Rocky", "https://mangarocky.com", "en")
diff --git a/src/en/mangarolls/build.gradle b/src/en/mangarolls/build.gradle
new file mode 100644
index 000000000..bd81ef14e
--- /dev/null
+++ b/src/en/mangarolls/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaRolls'
+ extClass = '.MangaRolls'
+ themePkg = 'madara'
+ baseUrl = 'https://mangarolls.net'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangarolls/res/mipmap-hdpi/ic_launcher.png b/src/en/mangarolls/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarolls/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangarolls/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarolls/res/mipmap-mdpi/ic_launcher.png b/src/en/mangarolls/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarolls/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangarolls/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarolls/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangarolls/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarolls/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangarolls/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarolls/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangarolls/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarolls/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangarolls/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarolls/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangarolls/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarolls/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangarolls/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarolls/src/MangaRolls.kt b/src/en/mangarolls/src/eu/kanade/tachiyomi/extension/en/mangarolls/MangaRolls.kt
similarity index 100%
rename from multisrc/overrides/madara/mangarolls/src/MangaRolls.kt
rename to src/en/mangarolls/src/eu/kanade/tachiyomi/extension/en/mangarolls/MangaRolls.kt
diff --git a/src/en/mangarosie/build.gradle b/src/en/mangarosie/build.gradle
new file mode 100644
index 000000000..2810e2a81
--- /dev/null
+++ b/src/en/mangarosie/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaRosie'
+ extClass = '.MangaRosie'
+ themePkg = 'madara'
+ baseUrl = 'https://mangarosie.in'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangarosie/res/mipmap-hdpi/ic_launcher.png b/src/en/mangarosie/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarosie/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangarosie/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarosie/res/mipmap-mdpi/ic_launcher.png b/src/en/mangarosie/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarosie/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangarosie/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarosie/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangarosie/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarosie/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangarosie/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarosie/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangarosie/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarosie/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangarosie/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarosie/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangarosie/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangarosie/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangarosie/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangarosie/src/MangaRosie.kt b/src/en/mangarosie/src/eu/kanade/tachiyomi/extension/en/mangarosie/MangaRosie.kt
similarity index 100%
rename from multisrc/overrides/madara/mangarosie/src/MangaRosie.kt
rename to src/en/mangarosie/src/eu/kanade/tachiyomi/extension/en/mangarosie/MangaRosie.kt
diff --git a/src/en/mangarubycom/build.gradle b/src/en/mangarubycom/build.gradle
new file mode 100644
index 000000000..ebd9cbc26
--- /dev/null
+++ b/src/en/mangarubycom/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaRuby.com'
+ extClass = '.MangaRubyCom'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaruby.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangarubycom/src/MangaRubyCom.kt b/src/en/mangarubycom/src/eu/kanade/tachiyomi/extension/en/mangarubycom/MangaRubyCom.kt
similarity index 100%
rename from multisrc/overrides/madara/mangarubycom/src/MangaRubyCom.kt
rename to src/en/mangarubycom/src/eu/kanade/tachiyomi/extension/en/mangarubycom/MangaRubyCom.kt
diff --git a/src/en/mangaryu/build.gradle b/src/en/mangaryu/build.gradle
new file mode 100644
index 000000000..e58bceeb0
--- /dev/null
+++ b/src/en/mangaryu/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Mangaryu'
+ extClass = '.Mangaryu'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaryu.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaryu/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaryu/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaryu/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaryu/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaryu/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaryu/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaryu/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaryu/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaryu/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaryu/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaryu/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaryu/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaryu/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaryu/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaryu/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaryu/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaryu/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaryu/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaryu/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaryu/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaryu/src/Mangaryu.kt b/src/en/mangaryu/src/eu/kanade/tachiyomi/extension/en/mangaryu/Mangaryu.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaryu/src/Mangaryu.kt
rename to src/en/mangaryu/src/eu/kanade/tachiyomi/extension/en/mangaryu/Mangaryu.kt
diff --git a/src/en/mangasco/build.gradle b/src/en/mangasco/build.gradle
new file mode 100644
index 000000000..d967c92fb
--- /dev/null
+++ b/src/en/mangasco/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaSco'
+ extClass = '.MangaSco'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwasco.net'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangasco/res/mipmap-hdpi/ic_launcher.png b/src/en/mangasco/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasco/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangasco/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasco/res/mipmap-mdpi/ic_launcher.png b/src/en/mangasco/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasco/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangasco/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasco/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangasco/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasco/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangasco/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasco/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangasco/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasco/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangasco/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasco/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangasco/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasco/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangasco/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangasco/src/eu/kanade/tachiyomi/extension/en/mangasco/MangaSco.kt b/src/en/mangasco/src/eu/kanade/tachiyomi/extension/en/mangasco/MangaSco.kt
new file mode 100644
index 000000000..095c79c22
--- /dev/null
+++ b/src/en/mangasco/src/eu/kanade/tachiyomi/extension/en/mangasco/MangaSco.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangasco
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaSco : Madara("MangaSco", "https://manhwasco.net", "en")
diff --git a/multisrc/overrides/nepnep/mangasee/AndroidManifest.xml b/src/en/mangasee/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/nepnep/mangasee/AndroidManifest.xml
rename to src/en/mangasee/AndroidManifest.xml
diff --git a/src/en/mangasee/build.gradle b/src/en/mangasee/build.gradle
new file mode 100644
index 000000000..304cef8cb
--- /dev/null
+++ b/src/en/mangasee/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaSee'
+ extClass = '.MangaSee'
+ themePkg = 'nepnep'
+ baseUrl = 'https://mangasee123.com'
+ overrideVersionCode = 24
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/nepnep/mangasee/res/mipmap-hdpi/ic_launcher.png b/src/en/mangasee/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/nepnep/mangasee/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangasee/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/nepnep/mangasee/res/mipmap-mdpi/ic_launcher.png b/src/en/mangasee/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/nepnep/mangasee/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangasee/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/nepnep/mangasee/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangasee/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/nepnep/mangasee/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangasee/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/nepnep/mangasee/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangasee/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/nepnep/mangasee/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangasee/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/nepnep/mangasee/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangasee/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/nepnep/mangasee/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangasee/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/nepnep/mangasee/src/MangaSee.kt b/src/en/mangasee/src/eu/kanade/tachiyomi/extension/en/mangasee/MangaSee.kt
similarity index 100%
rename from multisrc/overrides/nepnep/mangasee/src/MangaSee.kt
rename to src/en/mangasee/src/eu/kanade/tachiyomi/extension/en/mangasee/MangaSee.kt
diff --git a/multisrc/overrides/nepnep/mangasee/src/MangaseeUrlActivity.kt b/src/en/mangasee/src/eu/kanade/tachiyomi/extension/en/mangasee/MangaseeUrlActivity.kt
similarity index 100%
rename from multisrc/overrides/nepnep/mangasee/src/MangaseeUrlActivity.kt
rename to src/en/mangasee/src/eu/kanade/tachiyomi/extension/en/mangasee/MangaseeUrlActivity.kt
diff --git a/src/en/mangasiro/build.gradle b/src/en/mangasiro/build.gradle
new file mode 100644
index 000000000..4a844f2b3
--- /dev/null
+++ b/src/en/mangasiro/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaSiro'
+ extClass = '.MangaSiro'
+ themePkg = 'madara'
+ baseUrl = 'https://mangasiro.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangasiro/res/mipmap-hdpi/ic_launcher.png b/src/en/mangasiro/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasiro/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangasiro/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasiro/res/mipmap-mdpi/ic_launcher.png b/src/en/mangasiro/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasiro/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangasiro/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasiro/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangasiro/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasiro/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangasiro/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasiro/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangasiro/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasiro/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangasiro/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasiro/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangasiro/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasiro/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangasiro/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangasiro/src/eu/kanade/tachiyomi/extension/en/mangasiro/MangaSiro.kt b/src/en/mangasiro/src/eu/kanade/tachiyomi/extension/en/mangasiro/MangaSiro.kt
new file mode 100644
index 000000000..c2da44226
--- /dev/null
+++ b/src/en/mangasiro/src/eu/kanade/tachiyomi/extension/en/mangasiro/MangaSiro.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangasiro
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaSiro : Madara("MangaSiro", "https://mangasiro.com", "en")
diff --git a/src/en/mangastic/build.gradle b/src/en/mangastic/build.gradle
new file mode 100644
index 000000000..3bb50731a
--- /dev/null
+++ b/src/en/mangastic/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaStic'
+ extClass = '.MangaStic'
+ themePkg = 'madara'
+ baseUrl = 'https://mangastic9.com'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangastic/res/mipmap-hdpi/ic_launcher.png b/src/en/mangastic/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangastic/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangastic/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangastic/res/mipmap-mdpi/ic_launcher.png b/src/en/mangastic/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangastic/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangastic/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangastic/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangastic/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangastic/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangastic/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangastic/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangastic/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangastic/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangastic/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangastic/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangastic/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangastic/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangastic/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangastic/src/eu/kanade/tachiyomi/extension/en/mangastic/MangaStic.kt b/src/en/mangastic/src/eu/kanade/tachiyomi/extension/en/mangastic/MangaStic.kt
new file mode 100644
index 000000000..6009e006c
--- /dev/null
+++ b/src/en/mangastic/src/eu/kanade/tachiyomi/extension/en/mangastic/MangaStic.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangastic
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaStic : Madara("MangaStic", "https://mangastic9.com", "en")
diff --git a/src/en/mangasushi/build.gradle b/src/en/mangasushi/build.gradle
new file mode 100644
index 000000000..426d86710
--- /dev/null
+++ b/src/en/mangasushi/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangasushi'
+ extClass = '.Mangasushi'
+ themePkg = 'madara'
+ baseUrl = 'https://mangasushi.org'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangasushi/res/mipmap-hdpi/ic_launcher.png b/src/en/mangasushi/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasushi/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangasushi/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasushi/res/mipmap-mdpi/ic_launcher.png b/src/en/mangasushi/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasushi/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangasushi/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasushi/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangasushi/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasushi/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangasushi/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasushi/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangasushi/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasushi/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangasushi/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasushi/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangasushi/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasushi/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangasushi/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasushi/src/Mangasushi.kt b/src/en/mangasushi/src/eu/kanade/tachiyomi/extension/en/mangasushi/Mangasushi.kt
similarity index 100%
rename from multisrc/overrides/madara/mangasushi/src/Mangasushi.kt
rename to src/en/mangasushi/src/eu/kanade/tachiyomi/extension/en/mangasushi/Mangasushi.kt
diff --git a/src/en/mangatellers/build.gradle b/src/en/mangatellers/build.gradle
new file mode 100644
index 000000000..bfa2be37d
--- /dev/null
+++ b/src/en/mangatellers/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangatellers'
+ extClass = '.Mangatellers'
+ themePkg = 'foolslide'
+ baseUrl = 'https://reader.mangatellers.gr'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/foolslide/mangatellers/res/mipmap-hdpi/ic_launcher.png b/src/en/mangatellers/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/mangatellers/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangatellers/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/mangatellers/res/mipmap-mdpi/ic_launcher.png b/src/en/mangatellers/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/mangatellers/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangatellers/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/mangatellers/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangatellers/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/mangatellers/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangatellers/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/mangatellers/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangatellers/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/mangatellers/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangatellers/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/mangatellers/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangatellers/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/mangatellers/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangatellers/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/mangatellers/src/Mangatellers.kt b/src/en/mangatellers/src/eu/kanade/tachiyomi/extension/en/mangatellers/Mangatellers.kt
similarity index 100%
rename from multisrc/overrides/foolslide/mangatellers/src/Mangatellers.kt
rename to src/en/mangatellers/src/eu/kanade/tachiyomi/extension/en/mangatellers/Mangatellers.kt
diff --git a/src/en/mangatoday/build.gradle b/src/en/mangatoday/build.gradle
new file mode 100644
index 000000000..f436fd7dd
--- /dev/null
+++ b/src/en/mangatoday/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaToday'
+ extClass = '.MangaToday'
+ themePkg = 'mangahub'
+ baseUrl = 'https://mangatoday.fun'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangahub/mangatoday/src/MangaToday.kt b/src/en/mangatoday/src/eu/kanade/tachiyomi/extension/en/mangatoday/MangaToday.kt
similarity index 100%
rename from multisrc/overrides/mangahub/mangatoday/src/MangaToday.kt
rename to src/en/mangatoday/src/eu/kanade/tachiyomi/extension/en/mangatoday/MangaToday.kt
diff --git a/src/en/mangatone/build.gradle b/src/en/mangatone/build.gradle
new file mode 100644
index 000000000..9ba9e9ae3
--- /dev/null
+++ b/src/en/mangatone/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaTone'
+ extClass = '.MangaTone'
+ themePkg = 'madara'
+ baseUrl = 'https://mangatone.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangatone/res/mipmap-hdpi/ic_launcher.png b/src/en/mangatone/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatone/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangatone/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatone/res/mipmap-mdpi/ic_launcher.png b/src/en/mangatone/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatone/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangatone/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatone/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangatone/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatone/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangatone/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatone/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangatone/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatone/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangatone/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatone/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangatone/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatone/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangatone/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangatone/src/eu/kanade/tachiyomi/extension/en/mangatone/MangaTone.kt b/src/en/mangatone/src/eu/kanade/tachiyomi/extension/en/mangatone/MangaTone.kt
new file mode 100644
index 000000000..e7ed373e9
--- /dev/null
+++ b/src/en/mangatone/src/eu/kanade/tachiyomi/extension/en/mangatone/MangaTone.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangatone
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaTone : Madara("MangaTone", "https://mangatone.com", "en")
diff --git a/src/en/mangatoo/build.gradle b/src/en/mangatoo/build.gradle
new file mode 100644
index 000000000..61a68e2f0
--- /dev/null
+++ b/src/en/mangatoo/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Too'
+ extClass = '.MangaToo'
+ themePkg = 'madara'
+ baseUrl = 'https://mangatoo.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangatoo/res/mipmap-hdpi/ic_launcher.png b/src/en/mangatoo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatoo/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangatoo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatoo/res/mipmap-mdpi/ic_launcher.png b/src/en/mangatoo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatoo/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangatoo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatoo/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangatoo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatoo/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangatoo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatoo/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangatoo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatoo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangatoo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatoo/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangatoo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatoo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangatoo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangatoo/src/eu/kanade/tachiyomi/extension/en/mangatoo/MangaToo.kt b/src/en/mangatoo/src/eu/kanade/tachiyomi/extension/en/mangatoo/MangaToo.kt
new file mode 100644
index 000000000..05b442025
--- /dev/null
+++ b/src/en/mangatoo/src/eu/kanade/tachiyomi/extension/en/mangatoo/MangaToo.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangatoo
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaToo : Madara("Manga Too", "https://mangatoo.com", "en")
diff --git a/src/en/mangatoread/build.gradle b/src/en/mangatoread/build.gradle
new file mode 100644
index 000000000..eeee8703d
--- /dev/null
+++ b/src/en/mangatoread/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaToRead'
+ extClass = '.MangaToRead'
+ themePkg = 'madara'
+ baseUrl = 'https://mangatoread.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangatoread/res/mipmap-hdpi/ic_launcher.png b/src/en/mangatoread/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatoread/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangatoread/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatoread/res/mipmap-mdpi/ic_launcher.png b/src/en/mangatoread/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatoread/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangatoread/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatoread/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangatoread/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatoread/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangatoread/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatoread/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangatoread/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatoread/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangatoread/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatoread/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangatoread/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatoread/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangatoread/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangatoread/src/eu/kanade/tachiyomi/extension/en/mangatoread/MangaToRead.kt b/src/en/mangatoread/src/eu/kanade/tachiyomi/extension/en/mangatoread/MangaToRead.kt
new file mode 100644
index 000000000..7fda930f5
--- /dev/null
+++ b/src/en/mangatoread/src/eu/kanade/tachiyomi/extension/en/mangatoread/MangaToRead.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangatoread
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaToRead : Madara("MangaToRead", "https://mangatoread.com", "en")
diff --git a/src/en/mangatxgg/build.gradle b/src/en/mangatxgg/build.gradle
new file mode 100644
index 000000000..9aedd5b59
--- /dev/null
+++ b/src/en/mangatxgg/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Tx.gg (unoriginal)'
+ extClass = '.MangaTxGg'
+ themePkg = 'madara'
+ baseUrl = 'https://mangatx.gg'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangatxgg/src/MangaTxGg.kt b/src/en/mangatxgg/src/eu/kanade/tachiyomi/extension/en/mangatxgg/MangaTxGg.kt
similarity index 100%
rename from multisrc/overrides/madara/mangatxgg/src/MangaTxGg.kt
rename to src/en/mangatxgg/src/eu/kanade/tachiyomi/extension/en/mangatxgg/MangaTxGg.kt
diff --git a/src/en/mangatxunoriginal/build.gradle b/src/en/mangatxunoriginal/build.gradle
new file mode 100644
index 000000000..89b73cdd6
--- /dev/null
+++ b/src/en/mangatxunoriginal/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga-TX'
+ extClass = '.Mangatxunoriginal'
+ themePkg = 'madara'
+ baseUrl = 'https://manga-tx.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangatxunoriginal/res/mipmap-hdpi/ic_launcher.png b/src/en/mangatxunoriginal/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatxunoriginal/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangatxunoriginal/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatxunoriginal/res/mipmap-mdpi/ic_launcher.png b/src/en/mangatxunoriginal/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatxunoriginal/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangatxunoriginal/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatxunoriginal/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangatxunoriginal/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatxunoriginal/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangatxunoriginal/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatxunoriginal/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangatxunoriginal/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatxunoriginal/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangatxunoriginal/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatxunoriginal/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangatxunoriginal/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatxunoriginal/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangatxunoriginal/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatxunoriginal/src/Mangatxunoriginal.kt b/src/en/mangatxunoriginal/src/eu/kanade/tachiyomi/extension/en/mangatxunoriginal/Mangatxunoriginal.kt
similarity index 100%
rename from multisrc/overrides/madara/mangatxunoriginal/src/Mangatxunoriginal.kt
rename to src/en/mangatxunoriginal/src/eu/kanade/tachiyomi/extension/en/mangatxunoriginal/Mangatxunoriginal.kt
diff --git a/src/en/mangatyrant/build.gradle b/src/en/mangatyrant/build.gradle
new file mode 100644
index 000000000..31d0cf7f8
--- /dev/null
+++ b/src/en/mangatyrant/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaTyrant'
+ extClass = '.MangaTyrant'
+ themePkg = 'madara'
+ baseUrl = 'https://mangatyrant.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangatyrant/res/mipmap-hdpi/ic_launcher.png b/src/en/mangatyrant/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatyrant/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangatyrant/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatyrant/res/mipmap-mdpi/ic_launcher.png b/src/en/mangatyrant/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatyrant/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangatyrant/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatyrant/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangatyrant/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatyrant/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangatyrant/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatyrant/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangatyrant/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatyrant/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangatyrant/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatyrant/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangatyrant/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangatyrant/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangatyrant/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangatyrant/src/MangaTyrant.kt b/src/en/mangatyrant/src/eu/kanade/tachiyomi/extension/en/mangatyrant/MangaTyrant.kt
similarity index 100%
rename from multisrc/overrides/madara/mangatyrant/src/MangaTyrant.kt
rename to src/en/mangatyrant/src/eu/kanade/tachiyomi/extension/en/mangatyrant/MangaTyrant.kt
diff --git a/src/en/mangaupdatestop/build.gradle b/src/en/mangaupdatestop/build.gradle
new file mode 100644
index 000000000..b8a70037f
--- /dev/null
+++ b/src/en/mangaupdatestop/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaUpdates.top (unoriginal)'
+ extClass = '.MangaUpdatesTop'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaupdates.top'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaupdatestop/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaupdatestop/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaupdatestop/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaupdatestop/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaupdatestop/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaupdatestop/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaupdatestop/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaupdatestop/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaupdatestop/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaupdatestop/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaupdatestop/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaupdatestop/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaupdatestop/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaupdatestop/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaupdatestop/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaupdatestop/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaupdatestop/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaupdatestop/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaupdatestop/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaupdatestop/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaupdatestop/src/MangaUpdatesTop.kt b/src/en/mangaupdatestop/src/eu/kanade/tachiyomi/extension/en/mangaupdatestop/MangaUpdatesTop.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaupdatestop/src/MangaUpdatesTop.kt
rename to src/en/mangaupdatestop/src/eu/kanade/tachiyomi/extension/en/mangaupdatestop/MangaUpdatesTop.kt
diff --git a/src/en/mangaus/build.gradle b/src/en/mangaus/build.gradle
new file mode 100644
index 000000000..9a76c333b
--- /dev/null
+++ b/src/en/mangaus/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaUS'
+ extClass = '.MangaUS'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaus.xyz'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaus/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaus/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaus/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaus/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaus/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaus/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaus/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaus/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaus/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaus/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaus/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaus/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaus/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaus/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaus/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaus/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaus/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaus/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaus/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaus/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaus/src/MangaUS.kt b/src/en/mangaus/src/eu/kanade/tachiyomi/extension/en/mangaus/MangaUS.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaus/src/MangaUS.kt
rename to src/en/mangaus/src/eu/kanade/tachiyomi/extension/en/mangaus/MangaUS.kt
diff --git a/src/en/mangaweebs/build.gradle b/src/en/mangaweebs/build.gradle
new file mode 100644
index 000000000..3f1967ec3
--- /dev/null
+++ b/src/en/mangaweebs/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Weebs'
+ extClass = '.MangaWeebs'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaweebs.in'
+ overrideVersionCode = 8
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaweebs/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaweebs/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaweebs/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaweebs/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaweebs/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaweebs/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaweebs/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaweebs/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaweebs/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaweebs/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaweebs/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaweebs/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaweebs/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaweebs/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaweebs/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaweebs/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaweebs/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaweebs/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaweebs/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaweebs/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaweebs/src/MangaWeebs.kt b/src/en/mangaweebs/src/eu/kanade/tachiyomi/extension/en/mangaweebs/MangaWeebs.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaweebs/src/MangaWeebs.kt
rename to src/en/mangaweebs/src/eu/kanade/tachiyomi/extension/en/mangaweebs/MangaWeebs.kt
diff --git a/src/en/mangax1/build.gradle b/src/en/mangax1/build.gradle
new file mode 100644
index 000000000..7a2803442
--- /dev/null
+++ b/src/en/mangax1/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaX1'
+ extClass = '.MangaX1'
+ themePkg = 'madara'
+ baseUrl = 'https://mangax1.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangax1/res/mipmap-hdpi/ic_launcher.png b/src/en/mangax1/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangax1/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangax1/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangax1/res/mipmap-mdpi/ic_launcher.png b/src/en/mangax1/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangax1/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangax1/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangax1/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangax1/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangax1/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangax1/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangax1/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangax1/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangax1/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangax1/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangax1/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangax1/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangax1/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangax1/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangax1/src/eu/kanade/tachiyomi/extension/en/mangax1/MangaX1.kt b/src/en/mangax1/src/eu/kanade/tachiyomi/extension/en/mangax1/MangaX1.kt
new file mode 100644
index 000000000..9deed8743
--- /dev/null
+++ b/src/en/mangax1/src/eu/kanade/tachiyomi/extension/en/mangax1/MangaX1.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangax1
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaX1 : Madara("MangaX1", "https://mangax1.com", "en")
diff --git a/src/en/mangaxp/build.gradle b/src/en/mangaxp/build.gradle
new file mode 100644
index 000000000..9d780af7e
--- /dev/null
+++ b/src/en/mangaxp/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaXP'
+ extClass = '.MangaXP'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaxp.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaxp/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaxp/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaxp/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaxp/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaxp/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaxp/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaxp/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaxp/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaxp/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaxp/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaxp/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaxp/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaxp/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaxp/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaxp/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaxp/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaxp/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaxp/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaxp/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaxp/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangaxp/src/eu/kanade/tachiyomi/extension/en/mangaxp/MangaXP.kt b/src/en/mangaxp/src/eu/kanade/tachiyomi/extension/en/mangaxp/MangaXP.kt
new file mode 100644
index 000000000..e983a270c
--- /dev/null
+++ b/src/en/mangaxp/src/eu/kanade/tachiyomi/extension/en/mangaxp/MangaXP.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangaxp
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaXP : Madara("MangaXP", "https://mangaxp.com", "en")
diff --git a/src/en/mangaxyz/build.gradle b/src/en/mangaxyz/build.gradle
new file mode 100644
index 000000000..cde8284f6
--- /dev/null
+++ b/src/en/mangaxyz/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaXYZ'
+ extClass = '.MangaXYZ'
+ themePkg = 'madtheme'
+ baseUrl = 'https://mangaxyz.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madtheme/mangaxyz/res/mipmap-hdpi/ic_launcher.png b/src/en/mangaxyz/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangaxyz/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangaxyz/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangaxyz/res/mipmap-mdpi/ic_launcher.png b/src/en/mangaxyz/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangaxyz/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangaxyz/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangaxyz/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangaxyz/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangaxyz/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangaxyz/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangaxyz/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangaxyz/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangaxyz/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangaxyz/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/mangaxyz/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangaxyz/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/mangaxyz/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangaxyz/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangaxyz/src/eu/kanade/tachiyomi/extension/en/mangaxyz/MangaXYZ.kt b/src/en/mangaxyz/src/eu/kanade/tachiyomi/extension/en/mangaxyz/MangaXYZ.kt
new file mode 100644
index 000000000..7ee805c53
--- /dev/null
+++ b/src/en/mangaxyz/src/eu/kanade/tachiyomi/extension/en/mangaxyz/MangaXYZ.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangaxyz
+
+import eu.kanade.tachiyomi.multisrc.madtheme.MadTheme
+
+class MangaXYZ : MadTheme("MangaXYZ", "https://mangaxyz.com", "en")
diff --git a/src/en/mangayami/build.gradle b/src/en/mangayami/build.gradle
new file mode 100644
index 000000000..75f1b7e70
--- /dev/null
+++ b/src/en/mangayami/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaYami'
+ extClass = '.MangaYami'
+ themePkg = 'madara'
+ baseUrl = 'https://www.mangayami.club'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangayami/res/mipmap-hdpi/ic_launcher.png b/src/en/mangayami/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangayami/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mangayami/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangayami/res/mipmap-mdpi/ic_launcher.png b/src/en/mangayami/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangayami/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mangayami/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangayami/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangayami/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangayami/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mangayami/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangayami/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangayami/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangayami/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mangayami/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangayami/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangayami/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangayami/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mangayami/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mangayami/src/eu/kanade/tachiyomi/extension/en/mangayami/MangaYami.kt b/src/en/mangayami/src/eu/kanade/tachiyomi/extension/en/mangayami/MangaYami.kt
new file mode 100644
index 000000000..858113e8c
--- /dev/null
+++ b/src/en/mangayami/src/eu/kanade/tachiyomi/extension/en/mangayami/MangaYami.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mangayami
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaYami : Madara("MangaYami", "https://www.mangayami.club", "en")
diff --git a/src/en/manhuaaz/build.gradle b/src/en/manhuaaz/build.gradle
new file mode 100644
index 000000000..ec378cea0
--- /dev/null
+++ b/src/en/manhuaaz/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manhua AZ'
+ extClass = '.ManhuaAZ'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuaaz.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuaaz/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuaaz/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaaz/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuaaz/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaaz/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuaaz/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaaz/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuaaz/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaaz/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuaaz/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaaz/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuaaz/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaaz/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuaaz/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaaz/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuaaz/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaaz/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuaaz/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaaz/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuaaz/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaaz/src/ManhuaAZ.kt b/src/en/manhuaaz/src/eu/kanade/tachiyomi/extension/en/manhuaaz/ManhuaAZ.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuaaz/src/ManhuaAZ.kt
rename to src/en/manhuaaz/src/eu/kanade/tachiyomi/extension/en/manhuaaz/ManhuaAZ.kt
diff --git a/src/en/manhuabox/build.gradle b/src/en/manhuabox/build.gradle
new file mode 100644
index 000000000..e293283d3
--- /dev/null
+++ b/src/en/manhuabox/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhuaBox'
+ extClass = '.ManhuaBox'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuabox.net'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuabox/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuabox/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuabox/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuabox/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuabox/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuabox/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuabox/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuabox/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuabox/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuabox/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuabox/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuabox/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuabox/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuabox/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuabox/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuabox/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuabox/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuabox/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuabox/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuabox/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/manhuabox/src/eu/kanade/tachiyomi/extension/en/manhuabox/ManhuaBox.kt b/src/en/manhuabox/src/eu/kanade/tachiyomi/extension/en/manhuabox/ManhuaBox.kt
new file mode 100644
index 000000000..ab8ea398a
--- /dev/null
+++ b/src/en/manhuabox/src/eu/kanade/tachiyomi/extension/en/manhuabox/ManhuaBox.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.manhuabox
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class ManhuaBox : Madara("ManhuaBox", "https://manhuabox.net", "en")
diff --git a/src/en/manhuachill/build.gradle b/src/en/manhuachill/build.gradle
new file mode 100644
index 000000000..e06969239
--- /dev/null
+++ b/src/en/manhuachill/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhuaChill'
+ extClass = '.ManhuaChill'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuachill.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuachill/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuachill/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuachill/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuachill/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuachill/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuachill/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuachill/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuachill/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuachill/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuachill/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuachill/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuachill/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuachill/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuachill/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuachill/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuachill/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuachill/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuachill/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuachill/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuachill/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/manhuachill/src/eu/kanade/tachiyomi/extension/en/manhuachill/ManhuaChill.kt b/src/en/manhuachill/src/eu/kanade/tachiyomi/extension/en/manhuachill/ManhuaChill.kt
new file mode 100644
index 000000000..4bc73bd66
--- /dev/null
+++ b/src/en/manhuachill/src/eu/kanade/tachiyomi/extension/en/manhuachill/ManhuaChill.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.manhuachill
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class ManhuaChill : Madara("ManhuaChill", "https://manhuachill.com", "en")
diff --git a/src/en/manhuadex/build.gradle b/src/en/manhuadex/build.gradle
new file mode 100644
index 000000000..86b1f81dc
--- /dev/null
+++ b/src/en/manhuadex/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhuaDex'
+ extClass = '.ManhuaDex'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuadex.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuadex/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuadex/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuadex/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuadex/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuadex/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuadex/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuadex/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuadex/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuadex/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuadex/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuadex/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuadex/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuadex/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuadex/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuadex/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuadex/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuadex/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuadex/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuadex/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuadex/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuadex/src/ManhuaDex.kt b/src/en/manhuadex/src/eu/kanade/tachiyomi/extension/en/manhuadex/ManhuaDex.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuadex/src/ManhuaDex.kt
rename to src/en/manhuadex/src/eu/kanade/tachiyomi/extension/en/manhuadex/ManhuaDex.kt
diff --git a/src/en/manhuaes/build.gradle b/src/en/manhuaes/build.gradle
new file mode 100644
index 000000000..8c21bbff6
--- /dev/null
+++ b/src/en/manhuaes/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manhua ES'
+ extClass = '.ManhuaES'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuaes.com'
+ overrideVersionCode = 6
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuaes/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuaes/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaes/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuaes/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaes/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuaes/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaes/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuaes/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaes/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuaes/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaes/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuaes/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaes/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuaes/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaes/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuaes/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaes/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuaes/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaes/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuaes/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaes/src/ManhuaES.kt b/src/en/manhuaes/src/eu/kanade/tachiyomi/extension/en/manhuaes/ManhuaES.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuaes/src/ManhuaES.kt
rename to src/en/manhuaes/src/eu/kanade/tachiyomi/extension/en/manhuaes/ManhuaES.kt
diff --git a/src/en/manhuafast/build.gradle b/src/en/manhuafast/build.gradle
new file mode 100644
index 000000000..155f240bd
--- /dev/null
+++ b/src/en/manhuafast/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhuaFast'
+ extClass = '.ManhuaFast'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuafast.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuafast/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuafast/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuafast/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuafast/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuafast/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuafast/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuafast/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuafast/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuafast/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuafast/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuafast/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuafast/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuafast/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuafast/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuafast/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuafast/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuafast/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuafast/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuafast/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuafast/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuafast/src/ManhuaFast.kt b/src/en/manhuafast/src/eu/kanade/tachiyomi/extension/en/manhuafast/ManhuaFast.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuafast/src/ManhuaFast.kt
rename to src/en/manhuafast/src/eu/kanade/tachiyomi/extension/en/manhuafast/ManhuaFast.kt
diff --git a/src/en/manhuafastnet/build.gradle b/src/en/manhuafastnet/build.gradle
new file mode 100644
index 000000000..c0c94f35d
--- /dev/null
+++ b/src/en/manhuafastnet/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhuaFast.net (unoriginal)'
+ extClass = '.ManhuaFastNet'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuafast.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuafastnet/src/ManhuaFastNet.kt b/src/en/manhuafastnet/src/eu/kanade/tachiyomi/extension/en/manhuafastnet/ManhuaFastNet.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuafastnet/src/ManhuaFastNet.kt
rename to src/en/manhuafastnet/src/eu/kanade/tachiyomi/extension/en/manhuafastnet/ManhuaFastNet.kt
diff --git a/src/en/manhuaga/build.gradle b/src/en/manhuaga/build.gradle
new file mode 100644
index 000000000..83fc700a5
--- /dev/null
+++ b/src/en/manhuaga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manhuaga'
+ extClass = '.Manhuaga'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuaga.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuaga/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuaga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuaga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaga/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuaga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuaga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaga/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuaga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuaga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuaga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuaga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuaga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuaga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaga/src/Manhuaga.kt b/src/en/manhuaga/src/eu/kanade/tachiyomi/extension/en/manhuaga/Manhuaga.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuaga/src/Manhuaga.kt
rename to src/en/manhuaga/src/eu/kanade/tachiyomi/extension/en/manhuaga/Manhuaga.kt
diff --git a/src/en/manhuahot/build.gradle b/src/en/manhuahot/build.gradle
new file mode 100644
index 000000000..62c033718
--- /dev/null
+++ b/src/en/manhuahot/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhuaHot'
+ extClass = '.ManhuaHot'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuahot.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuahot/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuahot/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuahot/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuahot/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuahot/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuahot/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuahot/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuahot/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuahot/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuahot/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuahot/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuahot/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuahot/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuahot/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuahot/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuahot/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuahot/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuahot/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuahot/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuahot/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/manhuahot/src/eu/kanade/tachiyomi/extension/en/manhuahot/ManhuaHot.kt b/src/en/manhuahot/src/eu/kanade/tachiyomi/extension/en/manhuahot/ManhuaHot.kt
new file mode 100644
index 000000000..7015716ca
--- /dev/null
+++ b/src/en/manhuahot/src/eu/kanade/tachiyomi/extension/en/manhuahot/ManhuaHot.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.manhuahot
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class ManhuaHot : Madara("ManhuaHot", "https://manhuahot.com", "en")
diff --git a/src/en/manhuakiss/build.gradle b/src/en/manhuakiss/build.gradle
new file mode 100644
index 000000000..91c8f6a92
--- /dev/null
+++ b/src/en/manhuakiss/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhua Kiss'
+ extClass = '.ManhuaKiss'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuakiss.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuakiss/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuakiss/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuakiss/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuakiss/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuakiss/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuakiss/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuakiss/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuakiss/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuakiss/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuakiss/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuakiss/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuakiss/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuakiss/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuakiss/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuakiss/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuakiss/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuakiss/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuakiss/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuakiss/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuakiss/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuakiss/src/ManhuaKiss.kt b/src/en/manhuakiss/src/eu/kanade/tachiyomi/extension/en/manhuakiss/ManhuaKiss.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuakiss/src/ManhuaKiss.kt
rename to src/en/manhuakiss/src/eu/kanade/tachiyomi/extension/en/manhuakiss/ManhuaKiss.kt
diff --git a/src/en/manhuamanhwa/build.gradle b/src/en/manhuamanhwa/build.gradle
new file mode 100644
index 000000000..852ab2ad0
--- /dev/null
+++ b/src/en/manhuamanhwa/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManhuaManhwa'
+ extClass = '.ManhuaManhwa'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuamanhwa.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuamanhwa/src/ManhuaManhwa.kt b/src/en/manhuamanhwa/src/eu/kanade/tachiyomi/extension/en/manhuamanhwa/ManhuaManhwa.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuamanhwa/src/ManhuaManhwa.kt
rename to src/en/manhuamanhwa/src/eu/kanade/tachiyomi/extension/en/manhuamanhwa/ManhuaManhwa.kt
diff --git a/src/en/manhuamanhwaonline/build.gradle b/src/en/manhuamanhwaonline/build.gradle
new file mode 100644
index 000000000..5ad7ad9c7
--- /dev/null
+++ b/src/en/manhuamanhwaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhuaManhwa.online'
+ extClass = '.ManhuaManhwaOnline'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuamanhwa.online'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuamanhwaonline/src/ManhuaManhwaOnline.kt b/src/en/manhuamanhwaonline/src/eu/kanade/tachiyomi/extension/en/manhuamanhwaonline/ManhuaManhwaOnline.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuamanhwaonline/src/ManhuaManhwaOnline.kt
rename to src/en/manhuamanhwaonline/src/eu/kanade/tachiyomi/extension/en/manhuamanhwaonline/ManhuaManhwaOnline.kt
diff --git a/src/en/manhuaplus/build.gradle b/src/en/manhuaplus/build.gradle
new file mode 100644
index 000000000..d67d2549c
--- /dev/null
+++ b/src/en/manhuaplus/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manhua Plus'
+ extClass = '.ManhuaPlus'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuaplus.com'
+ overrideVersionCode = 6
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuaplus/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuaplus/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaplus/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuaplus/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaplus/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuaplus/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaplus/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuaplus/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaplus/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuaplus/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaplus/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuaplus/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaplus/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuaplus/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaplus/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuaplus/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaplus/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuaplus/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaplus/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuaplus/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaplus/src/ManhuaPlus.kt b/src/en/manhuaplus/src/eu/kanade/tachiyomi/extension/en/manhuaplus/ManhuaPlus.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuaplus/src/ManhuaPlus.kt
rename to src/en/manhuaplus/src/eu/kanade/tachiyomi/extension/en/manhuaplus/ManhuaPlus.kt
diff --git a/src/en/manhuascaninfo/build.gradle b/src/en/manhuascaninfo/build.gradle
new file mode 100644
index 000000000..b6db912a5
--- /dev/null
+++ b/src/en/manhuascaninfo/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManhuaScan.info (unoriginal)'
+ extClass = '.ManhuaScanInfo'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuascan.info'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuascaninfo/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuascaninfo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuascaninfo/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuascaninfo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuascaninfo/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuascaninfo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuascaninfo/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuascaninfo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuascaninfo/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuascaninfo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuascaninfo/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuascaninfo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuascaninfo/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuascaninfo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuascaninfo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuascaninfo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuascaninfo/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuascaninfo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuascaninfo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuascaninfo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuascaninfo/src/ManhuaScanInfo.kt b/src/en/manhuascaninfo/src/eu/kanade/tachiyomi/extension/en/manhuascaninfo/ManhuaScanInfo.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuascaninfo/src/ManhuaScanInfo.kt
rename to src/en/manhuascaninfo/src/eu/kanade/tachiyomi/extension/en/manhuascaninfo/ManhuaScanInfo.kt
diff --git a/src/en/manhuasnet/build.gradle b/src/en/manhuasnet/build.gradle
new file mode 100644
index 000000000..e38f84e47
--- /dev/null
+++ b/src/en/manhuasnet/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manhua Mix'
+ extClass = '.Manhuasnet'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuamix.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuasnet/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuasnet/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuasnet/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuasnet/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuasnet/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuasnet/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuasnet/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuasnet/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuasnet/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuasnet/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuasnet/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuasnet/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuasnet/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuasnet/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuasnet/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuasnet/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuasnet/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuasnet/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuasnet/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuasnet/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuasnet/src/Manhuasnet.kt b/src/en/manhuasnet/src/eu/kanade/tachiyomi/extension/en/manhuasnet/Manhuasnet.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuasnet/src/Manhuasnet.kt
rename to src/en/manhuasnet/src/eu/kanade/tachiyomi/extension/en/manhuasnet/Manhuasnet.kt
diff --git a/src/en/manhuasy/build.gradle b/src/en/manhuasy/build.gradle
new file mode 100644
index 000000000..dc3a2b34a
--- /dev/null
+++ b/src/en/manhuasy/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manhua SY'
+ extClass = '.ManhuaSY'
+ themePkg = 'madara'
+ baseUrl = 'https://www.manhuasy.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuasy/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuasy/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuasy/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuasy/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuasy/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuasy/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuasy/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuasy/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuasy/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuasy/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuasy/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuasy/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuasy/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuasy/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuasy/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuasy/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuasy/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuasy/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuasy/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuasy/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuasy/src/ManhuaSY.kt b/src/en/manhuasy/src/eu/kanade/tachiyomi/extension/en/manhuasy/ManhuaSY.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuasy/src/ManhuaSY.kt
rename to src/en/manhuasy/src/eu/kanade/tachiyomi/extension/en/manhuasy/ManhuaSY.kt
diff --git a/src/en/manhuaus/build.gradle b/src/en/manhuaus/build.gradle
new file mode 100644
index 000000000..783002fcd
--- /dev/null
+++ b/src/en/manhuaus/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhuaUS'
+ extClass = '.ManhuaUS'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuaus.com'
+ overrideVersionCode = 5
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuaus/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuaus/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaus/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuaus/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaus/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuaus/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaus/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuaus/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaus/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuaus/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaus/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuaus/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaus/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuaus/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaus/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuaus/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaus/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuaus/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuaus/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuaus/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuaus/src/ManhuaUS.kt b/src/en/manhuaus/src/eu/kanade/tachiyomi/extension/en/manhuaus/ManhuaUS.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuaus/src/ManhuaUS.kt
rename to src/en/manhuaus/src/eu/kanade/tachiyomi/extension/en/manhuaus/ManhuaUS.kt
diff --git a/src/en/manhuazone/build.gradle b/src/en/manhuazone/build.gradle
new file mode 100644
index 000000000..aca650458
--- /dev/null
+++ b/src/en/manhuazone/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhuaZone'
+ extClass = '.ManhuaZone'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuazone.org'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuazone/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuazone/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuazone/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuazone/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuazone/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuazone/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuazone/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuazone/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuazone/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuazone/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuazone/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuazone/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuazone/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuazone/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuazone/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuazone/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuazone/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuazone/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuazone/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuazone/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuazone/src/ManhuaZone.kt b/src/en/manhuazone/src/eu/kanade/tachiyomi/extension/en/manhuazone/ManhuaZone.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuazone/src/ManhuaZone.kt
rename to src/en/manhuazone/src/eu/kanade/tachiyomi/extension/en/manhuazone/ManhuaZone.kt
diff --git a/src/en/manhuazonghe/build.gradle b/src/en/manhuazonghe/build.gradle
new file mode 100644
index 000000000..2a95f93b4
--- /dev/null
+++ b/src/en/manhuazonghe/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhua Zonghe'
+ extClass = '.ManhuaZonghe'
+ themePkg = 'madara'
+ baseUrl = 'https://manhuazonghe.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhuazonghe/res/mipmap-hdpi/ic_launcher.png b/src/en/manhuazonghe/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuazonghe/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhuazonghe/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuazonghe/res/mipmap-mdpi/ic_launcher.png b/src/en/manhuazonghe/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuazonghe/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhuazonghe/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuazonghe/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhuazonghe/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuazonghe/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhuazonghe/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuazonghe/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhuazonghe/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuazonghe/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhuazonghe/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuazonghe/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhuazonghe/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhuazonghe/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhuazonghe/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhuazonghe/src/ManhuaZonghe.kt b/src/en/manhuazonghe/src/eu/kanade/tachiyomi/extension/en/manhuazonghe/ManhuaZonghe.kt
similarity index 100%
rename from multisrc/overrides/madara/manhuazonghe/src/ManhuaZonghe.kt
rename to src/en/manhuazonghe/src/eu/kanade/tachiyomi/extension/en/manhuazonghe/ManhuaZonghe.kt
diff --git a/src/en/manhwa18/build.gradle b/src/en/manhwa18/build.gradle
new file mode 100644
index 000000000..ecc892b1a
--- /dev/null
+++ b/src/en/manhwa18/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwa18'
+ extClass = '.Manhwa18'
+ themePkg = 'mymangacms'
+ baseUrl = 'https://manhwa18.com'
+ overrideVersionCode = 9
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mymangacms/manhwa18net/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwa18/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/manhwa18net/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwa18/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/manhwa18net/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwa18/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/manhwa18net/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwa18/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/manhwa18net/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwa18/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/manhwa18net/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwa18/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/manhwa18net/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwa18/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/manhwa18net/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwa18/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/manhwa18net/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwa18/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/manhwa18net/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwa18/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/manhwa18/src/Manhwa18.kt b/src/en/manhwa18/src/eu/kanade/tachiyomi/extension/en/manhwa18/Manhwa18.kt
similarity index 100%
rename from multisrc/overrides/mymangacms/manhwa18/src/Manhwa18.kt
rename to src/en/manhwa18/src/eu/kanade/tachiyomi/extension/en/manhwa18/Manhwa18.kt
diff --git a/src/en/manhwa18app/build.gradle b/src/en/manhwa18app/build.gradle
new file mode 100644
index 000000000..d81b6704b
--- /dev/null
+++ b/src/en/manhwa18app/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwa18.app'
+ extClass = '.Manhwa18app'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwa18.app'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwa18app/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwa18app/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18app/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwa18app/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18app/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwa18app/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18app/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwa18app/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18app/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwa18app/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18app/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwa18app/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18app/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwa18app/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18app/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwa18app/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18app/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwa18app/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18app/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwa18app/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt b/src/en/manhwa18app/src/eu/kanade/tachiyomi/extension/en/manhwa18app/Manhwa18app.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt
rename to src/en/manhwa18app/src/eu/kanade/tachiyomi/extension/en/manhwa18app/Manhwa18app.kt
diff --git a/src/en/manhwa18org/build.gradle b/src/en/manhwa18org/build.gradle
new file mode 100644
index 000000000..f6d319917
--- /dev/null
+++ b/src/en/manhwa18org/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwa18.org'
+ extClass = '.Manhwa18Org'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwa18.org'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwa18org/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwa18org/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18org/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwa18org/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18org/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwa18org/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18org/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwa18org/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18org/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwa18org/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18org/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwa18org/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18org/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwa18org/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18org/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwa18org/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18org/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwa18org/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa18org/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwa18org/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa18org/src/Manhwa18Org.kt b/src/en/manhwa18org/src/eu/kanade/tachiyomi/extension/en/manhwa18org/Manhwa18Org.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwa18org/src/Manhwa18Org.kt
rename to src/en/manhwa18org/src/eu/kanade/tachiyomi/extension/en/manhwa18org/Manhwa18Org.kt
diff --git a/src/en/manhwa2read/build.gradle b/src/en/manhwa2read/build.gradle
new file mode 100644
index 000000000..63001ff07
--- /dev/null
+++ b/src/en/manhwa2read/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manhwa2Read'
+ extClass = '.Manhwa2Read'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwa2read.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwa2read/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwa2read/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa2read/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwa2read/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa2read/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwa2read/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa2read/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwa2read/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa2read/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwa2read/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa2read/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwa2read/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa2read/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwa2read/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa2read/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwa2read/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa2read/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwa2read/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa2read/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwa2read/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa2read/src/Manhwa2Read.kt b/src/en/manhwa2read/src/eu/kanade/tachiyomi/extension/en/manhwa2read/Manhwa2Read.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwa2read/src/Manhwa2Read.kt
rename to src/en/manhwa2read/src/eu/kanade/tachiyomi/extension/en/manhwa2read/Manhwa2Read.kt
diff --git a/src/en/manhwa365/build.gradle b/src/en/manhwa365/build.gradle
new file mode 100644
index 000000000..a4766556b
--- /dev/null
+++ b/src/en/manhwa365/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwa365'
+ extClass = '.Manhwa365'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwa365.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwa365/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwa365/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa365/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwa365/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa365/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwa365/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa365/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwa365/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa365/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwa365/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa365/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwa365/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa365/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwa365/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa365/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwa365/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa365/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwa365/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa365/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwa365/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa365/src/Manhwa365.kt b/src/en/manhwa365/src/eu/kanade/tachiyomi/extension/en/manhwa365/Manhwa365.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwa365/src/Manhwa365.kt
rename to src/en/manhwa365/src/eu/kanade/tachiyomi/extension/en/manhwa365/Manhwa365.kt
diff --git a/src/en/manhwa68/build.gradle b/src/en/manhwa68/build.gradle
new file mode 100644
index 000000000..acb59b7e1
--- /dev/null
+++ b/src/en/manhwa68/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwa68'
+ extClass = '.Manhwa68'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwa68.com'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwa68/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwa68/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa68/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwa68/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa68/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwa68/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa68/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwa68/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa68/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwa68/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa68/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwa68/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa68/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwa68/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa68/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwa68/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa68/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwa68/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwa68/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwa68/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt b/src/en/manhwa68/src/eu/kanade/tachiyomi/extension/en/manhwa68/Manhwa68.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwa68/src/Manhwa68.kt
rename to src/en/manhwa68/src/eu/kanade/tachiyomi/extension/en/manhwa68/Manhwa68.kt
diff --git a/src/en/manhwabookshelf/build.gradle b/src/en/manhwabookshelf/build.gradle
new file mode 100644
index 000000000..2be27e83d
--- /dev/null
+++ b/src/en/manhwabookshelf/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhwaBookShelf'
+ extClass = '.ManhwaBookShelf'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwabookshelf.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwabookshelf/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwabookshelf/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwabookshelf/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwabookshelf/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwabookshelf/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwabookshelf/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwabookshelf/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwabookshelf/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwabookshelf/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwabookshelf/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwabookshelf/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwabookshelf/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwabookshelf/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwabookshelf/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwabookshelf/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwabookshelf/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwabookshelf/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwabookshelf/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwabookshelf/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwabookshelf/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/manhwabookshelf/src/eu/kanade/tachiyomi/extension/en/manhwabookshelf/ManhwaBookShelf.kt b/src/en/manhwabookshelf/src/eu/kanade/tachiyomi/extension/en/manhwabookshelf/ManhwaBookShelf.kt
new file mode 100644
index 000000000..f445036a9
--- /dev/null
+++ b/src/en/manhwabookshelf/src/eu/kanade/tachiyomi/extension/en/manhwabookshelf/ManhwaBookShelf.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.manhwabookshelf
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class ManhwaBookShelf : Madara("ManhwaBookShelf", "https://manhwabookshelf.com", "en")
diff --git a/src/en/manhwaclan/build.gradle b/src/en/manhwaclan/build.gradle
new file mode 100644
index 000000000..ae63c7f4d
--- /dev/null
+++ b/src/en/manhwaclan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhwaClan'
+ extClass = '.ManhwaClan'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwaclan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwaclan/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwaclan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaclan/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwaclan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaclan/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwaclan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaclan/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwaclan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaclan/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwaclan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaclan/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwaclan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaclan/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwaclan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaclan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwaclan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaclan/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwaclan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaclan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwaclan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaclan/src/ManhwaClan.kt b/src/en/manhwaclan/src/eu/kanade/tachiyomi/extension/en/manhwaclan/ManhwaClan.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwaclan/src/ManhwaClan.kt
rename to src/en/manhwaclan/src/eu/kanade/tachiyomi/extension/en/manhwaclan/ManhwaClan.kt
diff --git a/src/en/manhwaclub/build.gradle b/src/en/manhwaclub/build.gradle
new file mode 100644
index 000000000..b8bb8a96b
--- /dev/null
+++ b/src/en/manhwaclub/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManhwaClub'
+ extClass = '.ManhwaClub'
+ themePkg = 'hentaihand'
+ baseUrl = 'https://manhwa.club'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/hentaihand/manhwaclub/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwaclub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/manhwaclub/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwaclub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/manhwaclub/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwaclub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/manhwaclub/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwaclub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/manhwaclub/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwaclub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/manhwaclub/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwaclub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/manhwaclub/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwaclub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/manhwaclub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwaclub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/manhwaclub/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwaclub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/hentaihand/manhwaclub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwaclub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/hentaihand/manhwaclub/src/ManhwaClub.kt b/src/en/manhwaclub/src/eu/kanade/tachiyomi/extension/en/manhwaclub/ManhwaClub.kt
similarity index 100%
rename from multisrc/overrides/hentaihand/manhwaclub/src/ManhwaClub.kt
rename to src/en/manhwaclub/src/eu/kanade/tachiyomi/extension/en/manhwaclub/ManhwaClub.kt
diff --git a/src/en/manhwafreak/build.gradle b/src/en/manhwafreak/build.gradle
new file mode 100644
index 000000000..bb1e1f1a0
--- /dev/null
+++ b/src/en/manhwafreak/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manhwa Freak'
+ extClass = '.ManhwaFreak'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://manhwa-freak.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/manhwafreak/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwafreak/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwafreak/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwafreak/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwafreak/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwafreak/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwafreak/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwafreak/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwafreak/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwafreak/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwafreak/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwafreak/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwafreak/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwafreak/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwafreak/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwafreak/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwafreak/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwafreak/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwafreak/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwafreak/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwafreak/src/ManhwaFreak.kt b/src/en/manhwafreak/src/eu/kanade/tachiyomi/extension/en/manhwafreak/ManhwaFreak.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwafreak/src/ManhwaFreak.kt
rename to src/en/manhwafreak/src/eu/kanade/tachiyomi/extension/en/manhwafreak/ManhwaFreak.kt
diff --git a/src/en/manhwafull/build.gradle b/src/en/manhwafull/build.gradle
new file mode 100644
index 000000000..68ba74834
--- /dev/null
+++ b/src/en/manhwafull/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manhwafull'
+ extClass = '.Manhwafull'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwafull.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwafull/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwafull/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwafull/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwafull/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwafull/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwafull/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwafull/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwafull/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwafull/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwafull/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwafull/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwafull/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwafull/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwafull/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwafull/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwafull/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwafull/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwafull/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwafull/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwafull/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwafull/src/Manhwafull.kt b/src/en/manhwafull/src/eu/kanade/tachiyomi/extension/en/manhwafull/Manhwafull.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwafull/src/Manhwafull.kt
rename to src/en/manhwafull/src/eu/kanade/tachiyomi/extension/en/manhwafull/Manhwafull.kt
diff --git a/src/en/manhwahentaime/build.gradle b/src/en/manhwahentaime/build.gradle
new file mode 100644
index 000000000..245e430fe
--- /dev/null
+++ b/src/en/manhwahentaime/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwahentai.me'
+ extClass = '.ManhwahentaiMe'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwahentai.me'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwahentaime/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwahentaime/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwahentaime/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwahentaime/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwahentaime/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwahentaime/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwahentaime/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwahentaime/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwahentaime/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwahentaime/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwahentaime/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwahentaime/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwahentaime/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwahentaime/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwahentaime/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwahentaime/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwahentaime/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwahentaime/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwahentaime/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwahentaime/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwahentaime/src/ManhwahentaiMe.kt b/src/en/manhwahentaime/src/eu/kanade/tachiyomi/extension/en/manhwahentaime/ManhwahentaiMe.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwahentaime/src/ManhwahentaiMe.kt
rename to src/en/manhwahentaime/src/eu/kanade/tachiyomi/extension/en/manhwahentaime/ManhwahentaiMe.kt
diff --git a/src/en/manhwalover/build.gradle b/src/en/manhwalover/build.gradle
new file mode 100644
index 000000000..28b3dffa6
--- /dev/null
+++ b/src/en/manhwalover/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwa Lover'
+ extClass = '.ManhwaLover'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://manhwalover.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/manhwalover/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwalover/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalover/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwalover/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalover/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwalover/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalover/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwalover/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalover/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwalover/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalover/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwalover/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalover/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwalover/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalover/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwalover/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalover/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwalover/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalover/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwalover/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/manhwalover/src/eu/kanade/tachiyomi/extension/en/manhwalover/ManhwaLover.kt b/src/en/manhwalover/src/eu/kanade/tachiyomi/extension/en/manhwalover/ManhwaLover.kt
new file mode 100644
index 000000000..03e446d5a
--- /dev/null
+++ b/src/en/manhwalover/src/eu/kanade/tachiyomi/extension/en/manhwalover/ManhwaLover.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.manhwalover
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class ManhwaLover : MangaThemesia("Manhwa Lover", "https://manhwalover.com", "en")
diff --git a/src/en/manhwamanhua/build.gradle b/src/en/manhwamanhua/build.gradle
new file mode 100644
index 000000000..2877f47b6
--- /dev/null
+++ b/src/en/manhwamanhua/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManhwaManhua'
+ extClass = '.ManhwaManhua'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwamanhua.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwamanhua/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwamanhua/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwamanhua/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwamanhua/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwamanhua/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwamanhua/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwamanhua/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwamanhua/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwamanhua/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwamanhua/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwamanhua/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwamanhua/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwamanhua/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwamanhua/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwamanhua/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwamanhua/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwamanhua/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwamanhua/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwamanhua/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwamanhua/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwamanhua/src/ManhwaManhua.kt b/src/en/manhwamanhua/src/eu/kanade/tachiyomi/extension/en/manhwamanhua/ManhwaManhua.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwamanhua/src/ManhwaManhua.kt
rename to src/en/manhwamanhua/src/eu/kanade/tachiyomi/extension/en/manhwamanhua/ManhwaManhua.kt
diff --git a/src/en/manhwanew/build.gradle b/src/en/manhwanew/build.gradle
new file mode 100644
index 000000000..c397e162f
--- /dev/null
+++ b/src/en/manhwanew/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManhwaNew'
+ extClass = '.ManhwaNew'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwanew.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwanew/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwanew/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwanew/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwanew/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwanew/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwanew/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwanew/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwanew/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwanew/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwanew/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwanew/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwanew/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwanew/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwanew/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwanew/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwanew/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwanew/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwanew/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwanew/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwanew/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwanew/src/ManhwaNew.kt b/src/en/manhwanew/src/eu/kanade/tachiyomi/extension/en/manhwanew/ManhwaNew.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwanew/src/ManhwaNew.kt
rename to src/en/manhwanew/src/eu/kanade/tachiyomi/extension/en/manhwanew/ManhwaNew.kt
diff --git a/src/en/manhwasmen/build.gradle b/src/en/manhwasmen/build.gradle
new file mode 100644
index 000000000..3faf7fe68
--- /dev/null
+++ b/src/en/manhwasmen/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwas Men'
+ extClass = '.ManhwasMen'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwas.men'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwasmen/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwasmen/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwasmen/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwasmen/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwasmen/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwasmen/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwasmen/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwasmen/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwasmen/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwasmen/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwasmen/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwasmen/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwasmen/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwasmen/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwasmen/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwasmen/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwasmen/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwasmen/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwasmen/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwasmen/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwasmen/src/ManhwasMen.kt b/src/en/manhwasmen/src/eu/kanade/tachiyomi/extension/en/manhwasmen/ManhwasMen.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwasmen/src/ManhwasMen.kt
rename to src/en/manhwasmen/src/eu/kanade/tachiyomi/extension/en/manhwasmen/ManhwasMen.kt
diff --git a/src/en/manhwatop/build.gradle b/src/en/manhwatop/build.gradle
new file mode 100644
index 000000000..fd404c13c
--- /dev/null
+++ b/src/en/manhwatop/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manhwatop'
+ extClass = '.Manhwatop'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwatop.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwatop/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwatop/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwatop/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwatop/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwatop/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwatop/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwatop/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwatop/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwatop/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwatop/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwatop/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwatop/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwatop/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwatop/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwatop/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwatop/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwatop/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwatop/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwatop/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwatop/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwatop/src/Manhwatop.kt b/src/en/manhwatop/src/eu/kanade/tachiyomi/extension/en/manhwatop/Manhwatop.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwatop/src/Manhwatop.kt
rename to src/en/manhwatop/src/eu/kanade/tachiyomi/extension/en/manhwatop/Manhwatop.kt
diff --git a/src/en/manhwaworld/build.gradle b/src/en/manhwaworld/build.gradle
new file mode 100644
index 000000000..2d4ac66c8
--- /dev/null
+++ b/src/en/manhwaworld/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'AQUA Scans'
+ extClass = '.ManhwaWorld'
+ themePkg = 'madara'
+ baseUrl = 'https://aquascans.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwaworld/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwaworld/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaworld/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwaworld/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaworld/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwaworld/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaworld/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwaworld/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaworld/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwaworld/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaworld/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwaworld/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaworld/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwaworld/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaworld/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwaworld/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaworld/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwaworld/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaworld/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwaworld/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaworld/src/ManhwaWorld.kt b/src/en/manhwaworld/src/eu/kanade/tachiyomi/extension/en/manhwaworld/ManhwaWorld.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwaworld/src/ManhwaWorld.kt
rename to src/en/manhwaworld/src/eu/kanade/tachiyomi/extension/en/manhwaworld/ManhwaWorld.kt
diff --git a/src/en/manhwax/build.gradle b/src/en/manhwax/build.gradle
new file mode 100644
index 000000000..65d1e68a1
--- /dev/null
+++ b/src/en/manhwax/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwax'
+ extClass = '.Manhwax'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://manhwax.org'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/manhwax/src/eu/kanade/tachiyomi/extension/en/manhwax/Manhwax.kt b/src/en/manhwax/src/eu/kanade/tachiyomi/extension/en/manhwax/Manhwax.kt
new file mode 100644
index 000000000..3fb0e558e
--- /dev/null
+++ b/src/en/manhwax/src/eu/kanade/tachiyomi/extension/en/manhwax/Manhwax.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.manhwax
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class Manhwax : MangaThemesia("Manhwax", "https://manhwax.org", "en")
diff --git a/src/en/manhwaz/build.gradle b/src/en/manhwaz/build.gradle
new file mode 100644
index 000000000..013e91f88
--- /dev/null
+++ b/src/en/manhwaz/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManhwaZ'
+ extClass = '.ManhwaZ'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwaz.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwaz/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwaz/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaz/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwaz/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaz/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwaz/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaz/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwaz/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaz/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwaz/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaz/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwaz/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaz/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwaz/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaz/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwaz/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaz/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwaz/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaz/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwaz/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaz/src/ManhwaZ.kt b/src/en/manhwaz/src/eu/kanade/tachiyomi/extension/en/manhwaz/ManhwaZ.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwaz/src/ManhwaZ.kt
rename to src/en/manhwaz/src/eu/kanade/tachiyomi/extension/en/manhwaz/ManhwaZ.kt
diff --git a/src/en/manhwuafans/build.gradle b/src/en/manhwuafans/build.gradle
new file mode 100644
index 000000000..7338435cd
--- /dev/null
+++ b/src/en/manhwuafans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwua.fans'
+ extClass = '.Manhwuafans'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwua.fans'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwuafans/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwuafans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwuafans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manhwuafans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwuafans/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwuafans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwuafans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manhwuafans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwuafans/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwuafans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwuafans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manhwuafans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwuafans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwuafans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwuafans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manhwuafans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwuafans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwuafans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwuafans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manhwuafans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt b/src/en/manhwuafans/src/eu/kanade/tachiyomi/extension/en/manhwuafans/Manhwuafans.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt
rename to src/en/manhwuafans/src/eu/kanade/tachiyomi/extension/en/manhwuafans/Manhwuafans.kt
diff --git a/src/en/manycomic/build.gradle b/src/en/manycomic/build.gradle
new file mode 100644
index 000000000..89def46a3
--- /dev/null
+++ b/src/en/manycomic/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManyComic'
+ extClass = '.ManyComic'
+ themePkg = 'madara'
+ baseUrl = 'https://manycomic.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manycomic/res/mipmap-hdpi/ic_launcher.png b/src/en/manycomic/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manycomic/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manycomic/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manycomic/res/mipmap-mdpi/ic_launcher.png b/src/en/manycomic/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manycomic/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manycomic/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manycomic/res/mipmap-xhdpi/ic_launcher.png b/src/en/manycomic/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manycomic/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manycomic/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manycomic/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manycomic/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manycomic/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manycomic/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manycomic/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manycomic/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manycomic/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manycomic/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/manycomic/src/eu/kanade/tachiyomi/extension/en/manycomic/ManyComic.kt b/src/en/manycomic/src/eu/kanade/tachiyomi/extension/en/manycomic/ManyComic.kt
new file mode 100644
index 000000000..1e01df4a3
--- /dev/null
+++ b/src/en/manycomic/src/eu/kanade/tachiyomi/extension/en/manycomic/ManyComic.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.manycomic
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class ManyComic : Madara("ManyComic", "https://manycomic.com", "en")
diff --git a/src/en/manytoon/build.gradle b/src/en/manytoon/build.gradle
new file mode 100644
index 000000000..90d70fb4f
--- /dev/null
+++ b/src/en/manytoon/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManyToon'
+ extClass = '.ManyToon'
+ themePkg = 'madara'
+ baseUrl = 'https://manytoon.com'
+ overrideVersionCode = 5
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manytoon/res/mipmap-hdpi/ic_launcher.png b/src/en/manytoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoon/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manytoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoon/res/mipmap-mdpi/ic_launcher.png b/src/en/manytoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoon/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manytoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoon/res/mipmap-xhdpi/ic_launcher.png b/src/en/manytoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manytoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoon/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manytoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manytoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manytoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manytoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoon/src/ManyToon.kt b/src/en/manytoon/src/eu/kanade/tachiyomi/extension/en/manytoon/ManyToon.kt
similarity index 100%
rename from multisrc/overrides/madara/manytoon/src/ManyToon.kt
rename to src/en/manytoon/src/eu/kanade/tachiyomi/extension/en/manytoon/ManyToon.kt
diff --git a/src/en/manytoonme/build.gradle b/src/en/manytoonme/build.gradle
new file mode 100644
index 000000000..7cc217444
--- /dev/null
+++ b/src/en/manytoonme/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManyToon.me'
+ extClass = '.ManyToonMe'
+ themePkg = 'madara'
+ baseUrl = 'https://manytoon.me'
+ overrideVersionCode = 5
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manytoonme/res/mipmap-hdpi/ic_launcher.png b/src/en/manytoonme/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoonme/res/mipmap-hdpi/ic_launcher.png
rename to src/en/manytoonme/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoonme/res/mipmap-mdpi/ic_launcher.png b/src/en/manytoonme/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoonme/res/mipmap-mdpi/ic_launcher.png
rename to src/en/manytoonme/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoonme/res/mipmap-xhdpi/ic_launcher.png b/src/en/manytoonme/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoonme/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/manytoonme/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoonme/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manytoonme/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoonme/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/manytoonme/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoonme/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manytoonme/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoonme/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/manytoonme/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoonme/src/ManyToonMe.kt b/src/en/manytoonme/src/eu/kanade/tachiyomi/extension/en/manytoonme/ManyToonMe.kt
similarity index 100%
rename from multisrc/overrides/madara/manytoonme/src/ManyToonMe.kt
rename to src/en/manytoonme/src/eu/kanade/tachiyomi/extension/en/manytoonme/ManyToonMe.kt
diff --git a/src/en/midnightmessscans/build.gradle b/src/en/midnightmessscans/build.gradle
new file mode 100644
index 000000000..310594412
--- /dev/null
+++ b/src/en/midnightmessscans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Midnight Mess Scans'
+ extClass = '.MidnightMessScans'
+ themePkg = 'madara'
+ baseUrl = 'https://midnightmess.org'
+ overrideVersionCode = 6
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/midnightmessscans/res/mipmap-hdpi/ic_launcher.png b/src/en/midnightmessscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/midnightmessscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/midnightmessscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/midnightmessscans/res/mipmap-mdpi/ic_launcher.png b/src/en/midnightmessscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/midnightmessscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/midnightmessscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/midnightmessscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/midnightmessscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/midnightmessscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/midnightmessscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/midnightmessscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/midnightmessscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/midnightmessscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/midnightmessscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/midnightmessscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/midnightmessscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/midnightmessscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/midnightmessscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt b/src/en/midnightmessscans/src/eu/kanade/tachiyomi/extension/en/midnightmessscans/MidnightMessScans.kt
similarity index 100%
rename from multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt
rename to src/en/midnightmessscans/src/eu/kanade/tachiyomi/extension/en/midnightmessscans/MidnightMessScans.kt
diff --git a/src/en/milftoon/build.gradle b/src/en/milftoon/build.gradle
new file mode 100644
index 000000000..00bb45386
--- /dev/null
+++ b/src/en/milftoon/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Milftoon'
+ extClass = '.Milftoon'
+ themePkg = 'madara'
+ baseUrl = 'https://milftoon.xxx'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/milftoon/res/mipmap-hdpi/ic_launcher.png b/src/en/milftoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/milftoon/res/mipmap-hdpi/ic_launcher.png
rename to src/en/milftoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/milftoon/res/mipmap-mdpi/ic_launcher.png b/src/en/milftoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/milftoon/res/mipmap-mdpi/ic_launcher.png
rename to src/en/milftoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/milftoon/res/mipmap-xhdpi/ic_launcher.png b/src/en/milftoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/milftoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/milftoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/milftoon/res/mipmap-xxhdpi/ic_launcher.png b/src/en/milftoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/milftoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/milftoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/milftoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/milftoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/milftoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/milftoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/milftoon/src/Milftoon.kt b/src/en/milftoon/src/eu/kanade/tachiyomi/extension/en/milftoon/Milftoon.kt
similarity index 100%
rename from multisrc/overrides/madara/milftoon/src/Milftoon.kt
rename to src/en/milftoon/src/eu/kanade/tachiyomi/extension/en/milftoon/Milftoon.kt
diff --git a/src/en/mmscans/build.gradle b/src/en/mmscans/build.gradle
new file mode 100644
index 000000000..7b6fe768a
--- /dev/null
+++ b/src/en/mmscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MMScans'
+ extClass = '.MMScans'
+ themePkg = 'madara'
+ baseUrl = 'https://mm-scans.org'
+ overrideVersionCode = 7
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mmscans/res/mipmap-hdpi/ic_launcher.png b/src/en/mmscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mmscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mmscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mmscans/res/mipmap-mdpi/ic_launcher.png b/src/en/mmscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mmscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mmscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mmscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/mmscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mmscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mmscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mmscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mmscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mmscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mmscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mmscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mmscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mmscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mmscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mmscans/src/MMScans.kt b/src/en/mmscans/src/eu/kanade/tachiyomi/extension/en/mmscans/MMScans.kt
similarity index 100%
rename from multisrc/overrides/madara/mmscans/src/MMScans.kt
rename to src/en/mmscans/src/eu/kanade/tachiyomi/extension/en/mmscans/MMScans.kt
diff --git a/src/en/monochromecustom/build.gradle b/src/en/monochromecustom/build.gradle
new file mode 100644
index 000000000..29bde0eab
--- /dev/null
+++ b/src/en/monochromecustom/build.gradle
@@ -0,0 +1,8 @@
+ext {
+ extName = 'Monochrome Custom'
+ extClass = '.MonochromeCustom'
+ themePkg = 'monochrome'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/monochrome/monochromecustom/src/MonochromeCustom.kt b/src/en/monochromecustom/src/eu/kanade/tachiyomi/extension/en/monochromecustom/MonochromeCustom.kt
similarity index 100%
rename from multisrc/overrides/monochrome/monochromecustom/src/MonochromeCustom.kt
rename to src/en/monochromecustom/src/eu/kanade/tachiyomi/extension/en/monochromecustom/MonochromeCustom.kt
diff --git a/multisrc/overrides/monochrome/default/AndroidManifest.xml b/src/en/monochromescans/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/monochrome/default/AndroidManifest.xml
rename to src/en/monochromescans/AndroidManifest.xml
diff --git a/src/en/monochromescans/build.gradle b/src/en/monochromescans/build.gradle
new file mode 100644
index 000000000..5e75afc82
--- /dev/null
+++ b/src/en/monochromescans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Monochrome Scans'
+ extClass = '.MonochromeScans'
+ themePkg = 'monochrome'
+ baseUrl = 'https://manga.d34d.one'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/monochromescans/src/eu/kanade/tachiyomi/extension/en/monochromescans/MonochromeScans.kt b/src/en/monochromescans/src/eu/kanade/tachiyomi/extension/en/monochromescans/MonochromeScans.kt
new file mode 100644
index 000000000..dab19726d
--- /dev/null
+++ b/src/en/monochromescans/src/eu/kanade/tachiyomi/extension/en/monochromescans/MonochromeScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.monochromescans
+
+import eu.kanade.tachiyomi.multisrc.monochrome.MonochromeCMS
+
+class MonochromeScans : MonochromeCMS("Monochrome Scans", "https://manga.d34d.one", "en")
diff --git a/src/en/mortalsgroove/build.gradle b/src/en/mortalsgroove/build.gradle
new file mode 100644
index 000000000..071eb8709
--- /dev/null
+++ b/src/en/mortalsgroove/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mortals Groove'
+ extClass = '.MortalsGroove'
+ themePkg = 'madara'
+ baseUrl = 'https://mortalsgroove.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mortalsgroove/res/mipmap-hdpi/ic_launcher.png b/src/en/mortalsgroove/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mortalsgroove/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mortalsgroove/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mortalsgroove/res/mipmap-mdpi/ic_launcher.png b/src/en/mortalsgroove/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mortalsgroove/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mortalsgroove/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mortalsgroove/res/mipmap-xhdpi/ic_launcher.png b/src/en/mortalsgroove/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mortalsgroove/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mortalsgroove/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mortalsgroove/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mortalsgroove/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mortalsgroove/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mortalsgroove/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mortalsgroove/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mortalsgroove/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mortalsgroove/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mortalsgroove/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mortalsgroove/src/eu/kanade/tachiyomi/extension/en/mortalsgroove/MortalsGroove.kt b/src/en/mortalsgroove/src/eu/kanade/tachiyomi/extension/en/mortalsgroove/MortalsGroove.kt
new file mode 100644
index 000000000..eb3a0bb7a
--- /dev/null
+++ b/src/en/mortalsgroove/src/eu/kanade/tachiyomi/extension/en/mortalsgroove/MortalsGroove.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mortalsgroove
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MortalsGroove : Madara("Mortals Groove", "https://mortalsgroove.com", "en")
diff --git a/src/en/muctau/build.gradle b/src/en/muctau/build.gradle
new file mode 100644
index 000000000..2e7b7e8d2
--- /dev/null
+++ b/src/en/muctau/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Muctau'
+ extClass = '.Muctau'
+ themePkg = 'madara'
+ baseUrl = 'https://bibimanga.com'
+ overrideVersionCode = 4
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/muctau/res/mipmap-hdpi/ic_launcher.png b/src/en/muctau/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/muctau/res/mipmap-hdpi/ic_launcher.png
rename to src/en/muctau/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/muctau/res/mipmap-mdpi/ic_launcher.png b/src/en/muctau/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/muctau/res/mipmap-mdpi/ic_launcher.png
rename to src/en/muctau/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/muctau/res/mipmap-xhdpi/ic_launcher.png b/src/en/muctau/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/muctau/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/muctau/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/muctau/res/mipmap-xxhdpi/ic_launcher.png b/src/en/muctau/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/muctau/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/muctau/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/muctau/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/muctau/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/muctau/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/muctau/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/muctau/src/eu/kanade/tachiyomi/extension/en/muctau/Muctau.kt b/src/en/muctau/src/eu/kanade/tachiyomi/extension/en/muctau/Muctau.kt
new file mode 100644
index 000000000..42e8e1a0c
--- /dev/null
+++ b/src/en/muctau/src/eu/kanade/tachiyomi/extension/en/muctau/Muctau.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.muctau
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Muctau : Madara("Muctau", "https://bibimanga.com", "en")
diff --git a/src/en/murimscan/build.gradle b/src/en/murimscan/build.gradle
new file mode 100644
index 000000000..d766ce6aa
--- /dev/null
+++ b/src/en/murimscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MurimScan'
+ extClass = '.MurimScan'
+ themePkg = 'madara'
+ baseUrl = 'https://murimscan.run'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/murimscan/res/mipmap-hdpi/ic_launcher.png b/src/en/murimscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/murimscan/res/mipmap-hdpi/ic_launcher.png
rename to src/en/murimscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/murimscan/res/mipmap-mdpi/ic_launcher.png b/src/en/murimscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/murimscan/res/mipmap-mdpi/ic_launcher.png
rename to src/en/murimscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/murimscan/res/mipmap-xhdpi/ic_launcher.png b/src/en/murimscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/murimscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/murimscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/murimscan/res/mipmap-xxhdpi/ic_launcher.png b/src/en/murimscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/murimscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/murimscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/murimscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/murimscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/murimscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/murimscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/murimscan/src/MurimScan.kt b/src/en/murimscan/src/eu/kanade/tachiyomi/extension/en/murimscan/MurimScan.kt
similarity index 100%
rename from multisrc/overrides/madara/murimscan/src/MurimScan.kt
rename to src/en/murimscan/src/eu/kanade/tachiyomi/extension/en/murimscan/MurimScan.kt
diff --git a/src/en/mymanhwa/build.gradle b/src/en/mymanhwa/build.gradle
new file mode 100644
index 000000000..fb4ec9c73
--- /dev/null
+++ b/src/en/mymanhwa/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'My Manhwa'
+ extClass = '.MyManhwa'
+ themePkg = 'madara'
+ baseUrl = 'https://mymanhwa.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mymanhwa/res/mipmap-hdpi/ic_launcher.png b/src/en/mymanhwa/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mymanhwa/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mymanhwa/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mymanhwa/res/mipmap-mdpi/ic_launcher.png b/src/en/mymanhwa/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mymanhwa/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mymanhwa/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mymanhwa/res/mipmap-xhdpi/ic_launcher.png b/src/en/mymanhwa/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mymanhwa/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mymanhwa/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mymanhwa/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mymanhwa/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mymanhwa/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mymanhwa/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mymanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mymanhwa/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mymanhwa/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mymanhwa/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mymanhwa/src/eu/kanade/tachiyomi/extension/en/mymanhwa/MyManhwa.kt b/src/en/mymanhwa/src/eu/kanade/tachiyomi/extension/en/mymanhwa/MyManhwa.kt
new file mode 100644
index 000000000..c1f1a3e56
--- /dev/null
+++ b/src/en/mymanhwa/src/eu/kanade/tachiyomi/extension/en/mymanhwa/MyManhwa.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mymanhwa
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MyManhwa : Madara("My Manhwa", "https://mymanhwa.net", "en")
diff --git a/src/en/mysticalmerries/build.gradle b/src/en/mysticalmerries/build.gradle
new file mode 100644
index 000000000..1709e6eee
--- /dev/null
+++ b/src/en/mysticalmerries/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mystical Merries'
+ extClass = '.MysticalMerries'
+ themePkg = 'madara'
+ baseUrl = 'https://mysticalmerries.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mysticalmerries/res/mipmap-hdpi/ic_launcher.png b/src/en/mysticalmerries/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mysticalmerries/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mysticalmerries/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mysticalmerries/res/mipmap-mdpi/ic_launcher.png b/src/en/mysticalmerries/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mysticalmerries/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mysticalmerries/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mysticalmerries/res/mipmap-xhdpi/ic_launcher.png b/src/en/mysticalmerries/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mysticalmerries/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mysticalmerries/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mysticalmerries/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mysticalmerries/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mysticalmerries/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mysticalmerries/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mysticalmerries/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mysticalmerries/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mysticalmerries/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mysticalmerries/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mysticalmerries/src/MysticalMerries.kt b/src/en/mysticalmerries/src/eu/kanade/tachiyomi/extension/en/mysticalmerries/MysticalMerries.kt
similarity index 100%
rename from multisrc/overrides/madara/mysticalmerries/src/MysticalMerries.kt
rename to src/en/mysticalmerries/src/eu/kanade/tachiyomi/extension/en/mysticalmerries/MysticalMerries.kt
diff --git a/src/en/mytoon/build.gradle b/src/en/mytoon/build.gradle
new file mode 100644
index 000000000..f58b4b8c2
--- /dev/null
+++ b/src/en/mytoon/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'My Toon'
+ extClass = '.MyToon'
+ themePkg = 'zbulu'
+ baseUrl = 'https://mytoon.net'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zbulu/mytoon/res/mipmap-hdpi/ic_launcher.png b/src/en/mytoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/mytoon/res/mipmap-hdpi/ic_launcher.png
rename to src/en/mytoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zbulu/mytoon/res/mipmap-mdpi/ic_launcher.png b/src/en/mytoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/mytoon/res/mipmap-mdpi/ic_launcher.png
rename to src/en/mytoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zbulu/mytoon/res/mipmap-xhdpi/ic_launcher.png b/src/en/mytoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/mytoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/mytoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zbulu/mytoon/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mytoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/mytoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/mytoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zbulu/mytoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mytoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zbulu/mytoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/mytoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/mytoon/src/eu/kanade/tachiyomi/extension/en/mytoon/MyToon.kt b/src/en/mytoon/src/eu/kanade/tachiyomi/extension/en/mytoon/MyToon.kt
new file mode 100644
index 000000000..1db1eb14f
--- /dev/null
+++ b/src/en/mytoon/src/eu/kanade/tachiyomi/extension/en/mytoon/MyToon.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.mytoon
+
+import eu.kanade.tachiyomi.multisrc.zbulu.Zbulu
+
+class MyToon : Zbulu("My Toon", "https://mytoon.net", "en")
diff --git a/src/en/neatmanga/build.gradle b/src/en/neatmanga/build.gradle
new file mode 100644
index 000000000..759d53e4a
--- /dev/null
+++ b/src/en/neatmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'NeatManga'
+ extClass = '.NeatManga'
+ themePkg = 'madara'
+ baseUrl = 'https://neatmanga.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/neatmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/neatmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/neatmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/neatmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/neatmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/neatmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/neatmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/neatmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/neatmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/neatmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/neatmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/neatmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/neatmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/neatmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/neatmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/neatmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/neatmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/neatmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/neatmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/neatmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/neatmanga/src/NeatManga.kt b/src/en/neatmanga/src/eu/kanade/tachiyomi/extension/en/neatmanga/NeatManga.kt
similarity index 100%
rename from multisrc/overrides/madara/neatmanga/src/NeatManga.kt
rename to src/en/neatmanga/src/eu/kanade/tachiyomi/extension/en/neatmanga/NeatManga.kt
diff --git a/src/en/nekoscan/build.gradle b/src/en/nekoscan/build.gradle
new file mode 100644
index 000000000..d87e1e496
--- /dev/null
+++ b/src/en/nekoscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'NekoScan'
+ extClass = '.NekoScan'
+ themePkg = 'madara'
+ baseUrl = 'https://nekoscan.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/nekoscan/res/mipmap-hdpi/ic_launcher.png b/src/en/nekoscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nekoscan/res/mipmap-hdpi/ic_launcher.png
rename to src/en/nekoscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nekoscan/res/mipmap-mdpi/ic_launcher.png b/src/en/nekoscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nekoscan/res/mipmap-mdpi/ic_launcher.png
rename to src/en/nekoscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nekoscan/res/mipmap-xhdpi/ic_launcher.png b/src/en/nekoscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nekoscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/nekoscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nekoscan/res/mipmap-xxhdpi/ic_launcher.png b/src/en/nekoscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nekoscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/nekoscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nekoscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/nekoscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nekoscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/nekoscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/nekoscan/src/eu/kanade/tachiyomi/extension/en/nekoscan/NekoScan.kt b/src/en/nekoscan/src/eu/kanade/tachiyomi/extension/en/nekoscan/NekoScan.kt
new file mode 100644
index 000000000..ac951724a
--- /dev/null
+++ b/src/en/nekoscan/src/eu/kanade/tachiyomi/extension/en/nekoscan/NekoScan.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.nekoscan
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class NekoScan : Madara("NekoScan", "https://nekoscan.com", "en")
diff --git a/src/en/newmanhua/build.gradle b/src/en/newmanhua/build.gradle
new file mode 100644
index 000000000..53e5e6a65
--- /dev/null
+++ b/src/en/newmanhua/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'NewManhua'
+ extClass = '.NewManhua'
+ themePkg = 'madara'
+ baseUrl = 'https://newmanhua.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/newmanhua/res/mipmap-hdpi/ic_launcher.png b/src/en/newmanhua/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/newmanhua/res/mipmap-hdpi/ic_launcher.png
rename to src/en/newmanhua/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/newmanhua/res/mipmap-mdpi/ic_launcher.png b/src/en/newmanhua/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/newmanhua/res/mipmap-mdpi/ic_launcher.png
rename to src/en/newmanhua/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/newmanhua/res/mipmap-xhdpi/ic_launcher.png b/src/en/newmanhua/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/newmanhua/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/newmanhua/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/newmanhua/res/mipmap-xxhdpi/ic_launcher.png b/src/en/newmanhua/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/newmanhua/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/newmanhua/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/newmanhua/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/newmanhua/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/newmanhua/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/newmanhua/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/newmanhua/src/NewManhua.kt b/src/en/newmanhua/src/eu/kanade/tachiyomi/extension/en/newmanhua/NewManhua.kt
similarity index 100%
rename from multisrc/overrides/madara/newmanhua/src/NewManhua.kt
rename to src/en/newmanhua/src/eu/kanade/tachiyomi/extension/en/newmanhua/NewManhua.kt
diff --git a/src/en/nightcomic/build.gradle b/src/en/nightcomic/build.gradle
new file mode 100644
index 000000000..90091420c
--- /dev/null
+++ b/src/en/nightcomic/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Night Comic'
+ extClass = '.NightComic'
+ themePkg = 'madara'
+ baseUrl = 'https://www.nightcomic.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/nightcomic/res/mipmap-hdpi/ic_launcher.png b/src/en/nightcomic/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nightcomic/res/mipmap-hdpi/ic_launcher.png
rename to src/en/nightcomic/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nightcomic/res/mipmap-mdpi/ic_launcher.png b/src/en/nightcomic/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nightcomic/res/mipmap-mdpi/ic_launcher.png
rename to src/en/nightcomic/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nightcomic/res/mipmap-xhdpi/ic_launcher.png b/src/en/nightcomic/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nightcomic/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/nightcomic/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nightcomic/res/mipmap-xxhdpi/ic_launcher.png b/src/en/nightcomic/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nightcomic/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/nightcomic/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nightcomic/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/nightcomic/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nightcomic/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/nightcomic/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/nightcomic/src/eu/kanade/tachiyomi/extension/en/nightcomic/NightComic.kt b/src/en/nightcomic/src/eu/kanade/tachiyomi/extension/en/nightcomic/NightComic.kt
new file mode 100644
index 000000000..9dc6bb93f
--- /dev/null
+++ b/src/en/nightcomic/src/eu/kanade/tachiyomi/extension/en/nightcomic/NightComic.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.nightcomic
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class NightComic : Madara("Night Comic", "https://www.nightcomic.com", "en")
diff --git a/src/en/nightscans/build.gradle b/src/en/nightscans/build.gradle
new file mode 100644
index 000000000..e9a42d65a
--- /dev/null
+++ b/src/en/nightscans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'NIGHT SCANS'
+ extClass = '.NightScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://nightscans.net'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/nightscans/res/mipmap-hdpi/ic_launcher.png b/src/en/nightscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nightscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/nightscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nightscans/res/mipmap-mdpi/ic_launcher.png b/src/en/nightscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nightscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/nightscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nightscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/nightscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nightscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/nightscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nightscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/nightscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nightscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/nightscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nightscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/nightscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nightscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/nightscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nightscans/src/NightScans.kt b/src/en/nightscans/src/eu/kanade/tachiyomi/extension/en/nightscans/NightScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/nightscans/src/NightScans.kt
rename to src/en/nightscans/src/eu/kanade/tachiyomi/extension/en/nightscans/NightScans.kt
diff --git a/src/en/nitroscans/build.gradle b/src/en/nitroscans/build.gradle
new file mode 100644
index 000000000..7925c3bbd
--- /dev/null
+++ b/src/en/nitroscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Nitro Manga'
+ extClass = '.NitroScans'
+ themePkg = 'madara'
+ baseUrl = 'https://nitromanga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/nitroscans/res/mipmap-hdpi/ic_launcher.png b/src/en/nitroscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nitroscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/nitroscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nitroscans/res/mipmap-mdpi/ic_launcher.png b/src/en/nitroscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nitroscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/nitroscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nitroscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/nitroscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nitroscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/nitroscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nitroscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/nitroscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nitroscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/nitroscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nitroscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/nitroscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nitroscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/nitroscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nitroscans/src/NitroScans.kt b/src/en/nitroscans/src/eu/kanade/tachiyomi/extension/en/nitroscans/NitroScans.kt
similarity index 100%
rename from multisrc/overrides/madara/nitroscans/src/NitroScans.kt
rename to src/en/nitroscans/src/eu/kanade/tachiyomi/extension/en/nitroscans/NitroScans.kt
diff --git a/src/en/novelcrow/build.gradle b/src/en/novelcrow/build.gradle
new file mode 100644
index 000000000..b16e1c0e7
--- /dev/null
+++ b/src/en/novelcrow/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'NovelCrow'
+ extClass = '.NovelCrow'
+ themePkg = 'madara'
+ baseUrl = 'https://novelcrow.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/novelcrow/res/mipmap-hdpi/ic_launcher.png b/src/en/novelcrow/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/novelcrow/res/mipmap-hdpi/ic_launcher.png
rename to src/en/novelcrow/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/novelcrow/res/mipmap-mdpi/ic_launcher.png b/src/en/novelcrow/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/novelcrow/res/mipmap-mdpi/ic_launcher.png
rename to src/en/novelcrow/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/novelcrow/res/mipmap-xhdpi/ic_launcher.png b/src/en/novelcrow/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/novelcrow/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/novelcrow/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/novelcrow/res/mipmap-xxhdpi/ic_launcher.png b/src/en/novelcrow/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/novelcrow/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/novelcrow/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/novelcrow/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/novelcrow/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/novelcrow/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/novelcrow/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/novelcrow/src/NovelCrow.kt b/src/en/novelcrow/src/eu/kanade/tachiyomi/extension/en/novelcrow/NovelCrow.kt
similarity index 100%
rename from multisrc/overrides/madara/novelcrow/src/NovelCrow.kt
rename to src/en/novelcrow/src/eu/kanade/tachiyomi/extension/en/novelcrow/NovelCrow.kt
diff --git a/src/en/novelmic/build.gradle b/src/en/novelmic/build.gradle
new file mode 100644
index 000000000..4dd8a951a
--- /dev/null
+++ b/src/en/novelmic/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'NovelMic'
+ extClass = '.NovelMic'
+ themePkg = 'madara'
+ baseUrl = 'https://novelmic.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/novelmic/res/mipmap-hdpi/ic_launcher.png b/src/en/novelmic/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/novelmic/res/mipmap-hdpi/ic_launcher.png
rename to src/en/novelmic/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/novelmic/res/mipmap-mdpi/ic_launcher.png b/src/en/novelmic/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/novelmic/res/mipmap-mdpi/ic_launcher.png
rename to src/en/novelmic/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/novelmic/res/mipmap-xhdpi/ic_launcher.png b/src/en/novelmic/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/novelmic/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/novelmic/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/novelmic/res/mipmap-xxhdpi/ic_launcher.png b/src/en/novelmic/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/novelmic/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/novelmic/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/novelmic/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/novelmic/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/novelmic/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/novelmic/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/novelmic/src/eu/kanade/tachiyomi/extension/en/novelmic/NovelMic.kt b/src/en/novelmic/src/eu/kanade/tachiyomi/extension/en/novelmic/NovelMic.kt
new file mode 100644
index 000000000..7f80917f6
--- /dev/null
+++ b/src/en/novelmic/src/eu/kanade/tachiyomi/extension/en/novelmic/NovelMic.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.novelmic
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class NovelMic : Madara("NovelMic", "https://novelmic.com", "en")
diff --git a/src/en/ohnomanga/build.gradle b/src/en/ohnomanga/build.gradle
new file mode 100644
index 000000000..185c74f90
--- /dev/null
+++ b/src/en/ohnomanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Oh No Manga'
+ extClass = '.OhNoManga'
+ themePkg = 'madara'
+ baseUrl = 'https://ohnomanga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/ohnomanga/res/mipmap-hdpi/ic_launcher.png b/src/en/ohnomanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ohnomanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/ohnomanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ohnomanga/res/mipmap-mdpi/ic_launcher.png b/src/en/ohnomanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ohnomanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/ohnomanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ohnomanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/ohnomanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ohnomanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/ohnomanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ohnomanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/ohnomanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ohnomanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/ohnomanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ohnomanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/ohnomanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ohnomanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/ohnomanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/ohnomanga/src/eu/kanade/tachiyomi/extension/en/ohnomanga/OhNoManga.kt b/src/en/ohnomanga/src/eu/kanade/tachiyomi/extension/en/ohnomanga/OhNoManga.kt
new file mode 100644
index 000000000..43681f145
--- /dev/null
+++ b/src/en/ohnomanga/src/eu/kanade/tachiyomi/extension/en/ohnomanga/OhNoManga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.ohnomanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class OhNoManga : Madara("Oh No Manga", "https://ohnomanga.com", "en")
diff --git a/src/en/omegascans/build.gradle b/src/en/omegascans/build.gradle
new file mode 100644
index 000000000..00ff060e4
--- /dev/null
+++ b/src/en/omegascans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Omega Scans'
+ extClass = '.OmegaScans'
+ themePkg = 'heancms'
+ baseUrl = 'https://omegascans.org'
+ overrideVersionCode = 18
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/heancms/omegascans/res/mipmap-hdpi/ic_launcher.png b/src/en/omegascans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/omegascans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/omegascans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/omegascans/res/mipmap-mdpi/ic_launcher.png b/src/en/omegascans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/omegascans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/omegascans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/omegascans/res/mipmap-xhdpi/ic_launcher.png b/src/en/omegascans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/omegascans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/omegascans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/omegascans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/omegascans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/omegascans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/omegascans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/omegascans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/omegascans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/omegascans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/omegascans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/omegascans/src/OmegaScans.kt b/src/en/omegascans/src/eu/kanade/tachiyomi/extension/en/omegascans/OmegaScans.kt
similarity index 100%
rename from multisrc/overrides/heancms/omegascans/src/OmegaScans.kt
rename to src/en/omegascans/src/eu/kanade/tachiyomi/extension/en/omegascans/OmegaScans.kt
diff --git a/src/en/onemangaco/build.gradle b/src/en/onemangaco/build.gradle
new file mode 100644
index 000000000..f94fb5417
--- /dev/null
+++ b/src/en/onemangaco/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = '1Manga.co'
+ extClass = '.OneMangaCo'
+ themePkg = 'mangahub'
+ baseUrl = 'https://1manga.co'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangahub/onemangaco/src/OneMangaCo.kt b/src/en/onemangaco/src/eu/kanade/tachiyomi/extension/en/onemangaco/OneMangaCo.kt
similarity index 100%
rename from multisrc/overrides/mangahub/onemangaco/src/OneMangaCo.kt
rename to src/en/onemangaco/src/eu/kanade/tachiyomi/extension/en/onemangaco/OneMangaCo.kt
diff --git a/src/en/onemangainfo/build.gradle b/src/en/onemangainfo/build.gradle
new file mode 100644
index 000000000..8c8531d9b
--- /dev/null
+++ b/src/en/onemangainfo/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'OneManga.info'
+ extClass = '.OneMangaInfo'
+ themePkg = 'mangahub'
+ baseUrl = 'https://onemanga.info'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangahub/onemangainfo/src/OneMangaInfo.kt b/src/en/onemangainfo/src/eu/kanade/tachiyomi/extension/en/onemangainfo/OneMangaInfo.kt
similarity index 100%
rename from multisrc/overrides/mangahub/onemangainfo/src/OneMangaInfo.kt
rename to src/en/onemangainfo/src/eu/kanade/tachiyomi/extension/en/onemangainfo/OneMangaInfo.kt
diff --git a/src/en/onlymanhwa/build.gradle b/src/en/onlymanhwa/build.gradle
new file mode 100644
index 000000000..b2dcfd97b
--- /dev/null
+++ b/src/en/onlymanhwa/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'OnlyManhwa'
+ extClass = '.OnlyManhwa'
+ themePkg = 'madara'
+ baseUrl = 'https://onlymanhwa.org'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/onlymanhwa/src/OnlyManhwa.kt b/src/en/onlymanhwa/src/eu/kanade/tachiyomi/extension/en/onlymanhwa/OnlyManhwa.kt
similarity index 100%
rename from multisrc/overrides/madara/onlymanhwa/src/OnlyManhwa.kt
rename to src/en/onlymanhwa/src/eu/kanade/tachiyomi/extension/en/onlymanhwa/OnlyManhwa.kt
diff --git a/src/en/opscans/build.gradle b/src/en/opscans/build.gradle
new file mode 100644
index 000000000..e1616dcd9
--- /dev/null
+++ b/src/en/opscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'OPSCANS'
+ extClass = '.OPSCANS'
+ themePkg = 'madara'
+ baseUrl = 'https://opchapters.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/opscans/res/mipmap-hdpi/ic_launcher.png b/src/en/opscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/opscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/opscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/opscans/res/mipmap-mdpi/ic_launcher.png b/src/en/opscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/opscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/opscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/opscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/opscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/opscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/opscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/opscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/opscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/opscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/opscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/opscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/opscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/opscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/opscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/opscans/src/OPSCANS.kt b/src/en/opscans/src/eu/kanade/tachiyomi/extension/en/opscans/OPSCANS.kt
similarity index 100%
rename from multisrc/overrides/madara/opscans/src/OPSCANS.kt
rename to src/en/opscans/src/eu/kanade/tachiyomi/extension/en/opscans/OPSCANS.kt
diff --git a/src/en/paragonscans/build.gradle b/src/en/paragonscans/build.gradle
new file mode 100644
index 000000000..74e8a702e
--- /dev/null
+++ b/src/en/paragonscans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Paragon Scans'
+ extClass = '.ParagonScans'
+ themePkg = 'madara'
+ baseUrl = 'https://paragonscans.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/paragonscans/res/mipmap-hdpi/ic_launcher.png b/src/en/paragonscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/paragonscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/paragonscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/paragonscans/res/mipmap-mdpi/ic_launcher.png b/src/en/paragonscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/paragonscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/paragonscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/paragonscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/paragonscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/paragonscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/paragonscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/paragonscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/paragonscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/paragonscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/paragonscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/paragonscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/paragonscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/paragonscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/paragonscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/paragonscans/src/ParagonScans.kt b/src/en/paragonscans/src/eu/kanade/tachiyomi/extension/en/paragonscans/ParagonScans.kt
similarity index 100%
rename from multisrc/overrides/madara/paragonscans/src/ParagonScans.kt
rename to src/en/paragonscans/src/eu/kanade/tachiyomi/extension/en/paragonscans/ParagonScans.kt
diff --git a/src/en/pawmanga/build.gradle b/src/en/pawmanga/build.gradle
new file mode 100644
index 000000000..1114f09b6
--- /dev/null
+++ b/src/en/pawmanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Paw Manga'
+ extClass = '.PawManga'
+ themePkg = 'madara'
+ baseUrl = 'https://pawmanga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/pawmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/pawmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pawmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/pawmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pawmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/pawmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pawmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/pawmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pawmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/pawmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pawmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/pawmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pawmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/pawmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pawmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/pawmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pawmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/pawmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pawmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/pawmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pawmanga/src/PawManga.kt b/src/en/pawmanga/src/eu/kanade/tachiyomi/extension/en/pawmanga/PawManga.kt
similarity index 100%
rename from multisrc/overrides/madara/pawmanga/src/PawManga.kt
rename to src/en/pawmanga/src/eu/kanade/tachiyomi/extension/en/pawmanga/PawManga.kt
diff --git a/src/en/petrotechsociety/build.gradle b/src/en/petrotechsociety/build.gradle
new file mode 100644
index 000000000..4edd55011
--- /dev/null
+++ b/src/en/petrotechsociety/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Petrotechsociety'
+ extClass = '.Petrotechsociety'
+ themePkg = 'madara'
+ baseUrl = 'https://www.petrotechsociety.org'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/petrotechsociety/res/mipmap-hdpi/ic_launcher.png b/src/en/petrotechsociety/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/petrotechsociety/res/mipmap-hdpi/ic_launcher.png
rename to src/en/petrotechsociety/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/petrotechsociety/res/mipmap-mdpi/ic_launcher.png b/src/en/petrotechsociety/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/petrotechsociety/res/mipmap-mdpi/ic_launcher.png
rename to src/en/petrotechsociety/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/petrotechsociety/res/mipmap-xhdpi/ic_launcher.png b/src/en/petrotechsociety/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/petrotechsociety/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/petrotechsociety/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/petrotechsociety/res/mipmap-xxhdpi/ic_launcher.png b/src/en/petrotechsociety/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/petrotechsociety/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/petrotechsociety/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/petrotechsociety/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/petrotechsociety/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/petrotechsociety/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/petrotechsociety/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/petrotechsociety/src/eu/kanade/tachiyomi/extension/en/petrotechsociety/Petrotechsociety.kt b/src/en/petrotechsociety/src/eu/kanade/tachiyomi/extension/en/petrotechsociety/Petrotechsociety.kt
new file mode 100644
index 000000000..07080c54b
--- /dev/null
+++ b/src/en/petrotechsociety/src/eu/kanade/tachiyomi/extension/en/petrotechsociety/Petrotechsociety.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.petrotechsociety
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Petrotechsociety : Madara("Petrotechsociety", "https://www.petrotechsociety.org", "en")
diff --git a/src/en/phantomscans/build.gradle b/src/en/phantomscans/build.gradle
new file mode 100644
index 000000000..0d18ce1aa
--- /dev/null
+++ b/src/en/phantomscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Phantom Scans'
+ extClass = '.PhantomScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://phantomscans.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/phantomscans/res/mipmap-hdpi/ic_launcher.png b/src/en/phantomscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/phantomscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/phantomscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/phantomscans/res/mipmap-mdpi/ic_launcher.png b/src/en/phantomscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/phantomscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/phantomscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/phantomscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/phantomscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/phantomscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/phantomscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/phantomscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/phantomscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/phantomscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/phantomscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/phantomscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/phantomscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/phantomscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/phantomscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/phantomscans/src/eu/kanade/tachiyomi/extension/en/phantomscans/PhantomScans.kt b/src/en/phantomscans/src/eu/kanade/tachiyomi/extension/en/phantomscans/PhantomScans.kt
new file mode 100644
index 000000000..8003f9eb4
--- /dev/null
+++ b/src/en/phantomscans/src/eu/kanade/tachiyomi/extension/en/phantomscans/PhantomScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.phantomscans
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class PhantomScans : MangaThemesia("Phantom Scans", "https://phantomscans.com", "en")
diff --git a/src/en/pianmanga/build.gradle b/src/en/pianmanga/build.gradle
new file mode 100644
index 000000000..072926e21
--- /dev/null
+++ b/src/en/pianmanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Pian Manga'
+ extClass = '.PianManga'
+ themePkg = 'madara'
+ baseUrl = 'https://pianmanga.me'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/pianmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/pianmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pianmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/pianmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pianmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/pianmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pianmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/pianmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pianmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/pianmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pianmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/pianmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pianmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/pianmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pianmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/pianmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pianmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/pianmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pianmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/pianmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/pianmanga/src/eu/kanade/tachiyomi/extension/en/pianmanga/PianManga.kt b/src/en/pianmanga/src/eu/kanade/tachiyomi/extension/en/pianmanga/PianManga.kt
new file mode 100644
index 000000000..0140b41ba
--- /dev/null
+++ b/src/en/pianmanga/src/eu/kanade/tachiyomi/extension/en/pianmanga/PianManga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.pianmanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class PianManga : Madara("Pian Manga", "https://pianmanga.me", "en")
diff --git a/src/en/platinumcrown/build.gradle b/src/en/platinumcrown/build.gradle
new file mode 100644
index 000000000..2afa531fc
--- /dev/null
+++ b/src/en/platinumcrown/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Platinum Crown'
+ extClass = '.PlatinumCrown'
+ themePkg = 'madara'
+ baseUrl = 'https://platinumscans.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/platinumcrown/res/mipmap-hdpi/ic_launcher.png b/src/en/platinumcrown/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/platinumcrown/res/mipmap-hdpi/ic_launcher.png
rename to src/en/platinumcrown/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/platinumcrown/res/mipmap-mdpi/ic_launcher.png b/src/en/platinumcrown/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/platinumcrown/res/mipmap-mdpi/ic_launcher.png
rename to src/en/platinumcrown/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/platinumcrown/res/mipmap-xhdpi/ic_launcher.png b/src/en/platinumcrown/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/platinumcrown/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/platinumcrown/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/platinumcrown/res/mipmap-xxhdpi/ic_launcher.png b/src/en/platinumcrown/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/platinumcrown/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/platinumcrown/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/platinumcrown/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/platinumcrown/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/platinumcrown/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/platinumcrown/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/platinumcrown/src/eu/kanade/tachiyomi/extension/en/platinumcrown/PlatinumCrown.kt b/src/en/platinumcrown/src/eu/kanade/tachiyomi/extension/en/platinumcrown/PlatinumCrown.kt
new file mode 100644
index 000000000..d4574e7e0
--- /dev/null
+++ b/src/en/platinumcrown/src/eu/kanade/tachiyomi/extension/en/platinumcrown/PlatinumCrown.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.platinumcrown
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class PlatinumCrown : Madara("Platinum Crown", "https://platinumscans.com", "en")
diff --git a/src/en/pmscans/build.gradle b/src/en/pmscans/build.gradle
new file mode 100644
index 000000000..fb22cbab6
--- /dev/null
+++ b/src/en/pmscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'PMScans'
+ extClass = '.PMScans'
+ themePkg = 'madara'
+ baseUrl = 'https://rackusreads.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/pmscans/res/mipmap-hdpi/ic_launcher.png b/src/en/pmscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pmscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/pmscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pmscans/res/mipmap-mdpi/ic_launcher.png b/src/en/pmscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pmscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/pmscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pmscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/pmscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pmscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/pmscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pmscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/pmscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pmscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/pmscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pmscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/pmscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pmscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/pmscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pmscans/src/PMScans.kt b/src/en/pmscans/src/eu/kanade/tachiyomi/extension/en/pmscans/PMScans.kt
similarity index 100%
rename from multisrc/overrides/madara/pmscans/src/PMScans.kt
rename to src/en/pmscans/src/eu/kanade/tachiyomi/extension/en/pmscans/PMScans.kt
diff --git a/src/en/pomanga/build.gradle b/src/en/pomanga/build.gradle
new file mode 100644
index 000000000..f74fd55f4
--- /dev/null
+++ b/src/en/pomanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'PoManga'
+ extClass = '.PoManga'
+ themePkg = 'madara'
+ baseUrl = 'https://pomanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/pomanga/res/mipmap-hdpi/ic_launcher.png b/src/en/pomanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pomanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/pomanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pomanga/res/mipmap-mdpi/ic_launcher.png b/src/en/pomanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pomanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/pomanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pomanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/pomanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pomanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/pomanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pomanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/pomanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pomanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/pomanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pomanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/pomanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pomanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/pomanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/pomanga/src/eu/kanade/tachiyomi/extension/en/pomanga/PoManga.kt b/src/en/pomanga/src/eu/kanade/tachiyomi/extension/en/pomanga/PoManga.kt
new file mode 100644
index 000000000..5b3144d66
--- /dev/null
+++ b/src/en/pomanga/src/eu/kanade/tachiyomi/extension/en/pomanga/PoManga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.pomanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class PoManga : Madara("PoManga", "https://pomanga.com", "en")
diff --git a/src/en/ponymanga/build.gradle b/src/en/ponymanga/build.gradle
new file mode 100644
index 000000000..a2262fc6f
--- /dev/null
+++ b/src/en/ponymanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Pony Manga'
+ extClass = '.PonyManga'
+ themePkg = 'madara'
+ baseUrl = 'https://ponymanga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/ponymanga/res/mipmap-hdpi/ic_launcher.png b/src/en/ponymanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ponymanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/ponymanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ponymanga/res/mipmap-mdpi/ic_launcher.png b/src/en/ponymanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ponymanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/ponymanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ponymanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/ponymanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ponymanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/ponymanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ponymanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/ponymanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ponymanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/ponymanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ponymanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/ponymanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ponymanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/ponymanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ponymanga/src/PonyManga.kt b/src/en/ponymanga/src/eu/kanade/tachiyomi/extension/en/ponymanga/PonyManga.kt
similarity index 100%
rename from multisrc/overrides/madara/ponymanga/src/PonyManga.kt
rename to src/en/ponymanga/src/eu/kanade/tachiyomi/extension/en/ponymanga/PonyManga.kt
diff --git a/src/en/porncomix/build.gradle b/src/en/porncomix/build.gradle
new file mode 100644
index 000000000..f2426ce64
--- /dev/null
+++ b/src/en/porncomix/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'PornComix'
+ extClass = '.PornComix'
+ themePkg = 'madara'
+ baseUrl = 'https://www.porncomixonline.net'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/porncomix/res/mipmap-hdpi/ic_launcher.png b/src/en/porncomix/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/porncomix/res/mipmap-hdpi/ic_launcher.png
rename to src/en/porncomix/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/porncomix/res/mipmap-mdpi/ic_launcher.png b/src/en/porncomix/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/porncomix/res/mipmap-mdpi/ic_launcher.png
rename to src/en/porncomix/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/porncomix/res/mipmap-xhdpi/ic_launcher.png b/src/en/porncomix/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/porncomix/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/porncomix/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/porncomix/res/mipmap-xxhdpi/ic_launcher.png b/src/en/porncomix/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/porncomix/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/porncomix/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/porncomix/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/porncomix/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/porncomix/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/porncomix/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/porncomix/src/eu/kanade/tachiyomi/extension/en/porncomix/PornComix.kt b/src/en/porncomix/src/eu/kanade/tachiyomi/extension/en/porncomix/PornComix.kt
new file mode 100644
index 000000000..e82085ee0
--- /dev/null
+++ b/src/en/porncomix/src/eu/kanade/tachiyomi/extension/en/porncomix/PornComix.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.porncomix
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class PornComix : Madara("PornComix", "https://www.porncomixonline.net", "en")
diff --git a/src/en/pornwha/build.gradle b/src/en/pornwha/build.gradle
new file mode 100644
index 000000000..468a230f3
--- /dev/null
+++ b/src/en/pornwha/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Pornwha'
+ extClass = '.Pornwha'
+ themePkg = 'madara'
+ baseUrl = 'https://pornwha.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/pornwha/res/mipmap-hdpi/ic_launcher.png b/src/en/pornwha/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pornwha/res/mipmap-hdpi/ic_launcher.png
rename to src/en/pornwha/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pornwha/res/mipmap-mdpi/ic_launcher.png b/src/en/pornwha/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pornwha/res/mipmap-mdpi/ic_launcher.png
rename to src/en/pornwha/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pornwha/res/mipmap-xhdpi/ic_launcher.png b/src/en/pornwha/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pornwha/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/pornwha/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pornwha/res/mipmap-xxhdpi/ic_launcher.png b/src/en/pornwha/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pornwha/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/pornwha/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pornwha/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/pornwha/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pornwha/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/pornwha/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/pornwha/src/eu/kanade/tachiyomi/extension/en/pornwha/Pornwha.kt b/src/en/pornwha/src/eu/kanade/tachiyomi/extension/en/pornwha/Pornwha.kt
new file mode 100644
index 000000000..008d16ac7
--- /dev/null
+++ b/src/en/pornwha/src/eu/kanade/tachiyomi/extension/en/pornwha/Pornwha.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.pornwha
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Pornwha : Madara("Pornwha", "https://pornwha.com", "en")
diff --git a/src/en/quantumscans/build.gradle b/src/en/quantumscans/build.gradle
new file mode 100644
index 000000000..bd8623390
--- /dev/null
+++ b/src/en/quantumscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Quantum Scans'
+ extClass = '.QuantumScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://readers-point.space'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/quantumscans/res/mipmap-hdpi/ic_launcher.png b/src/en/quantumscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/quantumscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/quantumscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/quantumscans/res/mipmap-mdpi/ic_launcher.png b/src/en/quantumscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/quantumscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/quantumscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/quantumscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/quantumscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/quantumscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/quantumscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/quantumscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/quantumscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/quantumscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/quantumscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/quantumscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/quantumscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/quantumscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/quantumscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/quantumscans/src/QuantumScans.kt b/src/en/quantumscans/src/eu/kanade/tachiyomi/extension/en/quantumscans/QuantumScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/quantumscans/src/QuantumScans.kt
rename to src/en/quantumscans/src/eu/kanade/tachiyomi/extension/en/quantumscans/QuantumScans.kt
diff --git a/src/en/queenscans/build.gradle b/src/en/queenscans/build.gradle
new file mode 100644
index 000000000..20e2be1ba
--- /dev/null
+++ b/src/en/queenscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Fairy Manga'
+ extClass = '.QueenScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://fairymanga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/queenscans/res/mipmap-hdpi/ic_launcher.png b/src/en/queenscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/queenscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/queenscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/queenscans/res/mipmap-mdpi/ic_launcher.png b/src/en/queenscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/queenscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/queenscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/queenscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/queenscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/queenscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/queenscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/queenscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/queenscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/queenscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/queenscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/queenscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/queenscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/queenscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/queenscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/queenscans/src/QueenScans.kt b/src/en/queenscans/src/eu/kanade/tachiyomi/extension/en/queenscans/QueenScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/queenscans/src/QueenScans.kt
rename to src/en/queenscans/src/eu/kanade/tachiyomi/extension/en/queenscans/QueenScans.kt
diff --git a/src/en/ravenscans/build.gradle b/src/en/ravenscans/build.gradle
new file mode 100644
index 000000000..3d450600d
--- /dev/null
+++ b/src/en/ravenscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Raven Scans'
+ extClass = '.RavenScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://ravenscans.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/ravenscans/res/mipmap-hdpi/ic_launcher.png b/src/en/ravenscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ravenscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/ravenscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ravenscans/res/mipmap-mdpi/ic_launcher.png b/src/en/ravenscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ravenscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/ravenscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ravenscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/ravenscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ravenscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/ravenscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ravenscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/ravenscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ravenscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/ravenscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ravenscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/ravenscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ravenscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/ravenscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/ravenscans/src/eu/kanade/tachiyomi/extension/en/ravenscans/RavenScans.kt b/src/en/ravenscans/src/eu/kanade/tachiyomi/extension/en/ravenscans/RavenScans.kt
new file mode 100644
index 000000000..e4d32ab4c
--- /dev/null
+++ b/src/en/ravenscans/src/eu/kanade/tachiyomi/extension/en/ravenscans/RavenScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.ravenscans
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class RavenScans : MangaThemesia("Raven Scans", "https://ravenscans.com", "en")
diff --git a/src/en/readallcomicscom/build.gradle b/src/en/readallcomicscom/build.gradle
new file mode 100644
index 000000000..f79ec0c18
--- /dev/null
+++ b/src/en/readallcomicscom/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ReadAllComics'
+ extClass = '.ReadAllComicsCom'
+ themePkg = 'readallcomics'
+ baseUrl = 'https://readallcomics.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/readallcomics/readallcomicscom/res/mipmap-hdpi/ic_launcher.png b/src/en/readallcomicscom/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/readallcomicscom/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readallcomicscom/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/readallcomicscom/res/mipmap-mdpi/ic_launcher.png b/src/en/readallcomicscom/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/readallcomicscom/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readallcomicscom/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/readallcomicscom/res/mipmap-xhdpi/ic_launcher.png b/src/en/readallcomicscom/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/readallcomicscom/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readallcomicscom/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/readallcomicscom/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readallcomicscom/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/readallcomicscom/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readallcomicscom/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/readallcomicscom/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readallcomicscom/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/readallcomicscom/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readallcomicscom/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/readallcomicscom/src/ReadAllComicsCom.kt b/src/en/readallcomicscom/src/eu/kanade/tachiyomi/extension/en/readallcomicscom/ReadAllComicsCom.kt
similarity index 100%
rename from multisrc/overrides/readallcomics/readallcomicscom/src/ReadAllComicsCom.kt
rename to src/en/readallcomicscom/src/eu/kanade/tachiyomi/extension/en/readallcomicscom/ReadAllComicsCom.kt
diff --git a/src/en/readallmanga/build.gradle b/src/en/readallmanga/build.gradle
new file mode 100644
index 000000000..44b1dd0e5
--- /dev/null
+++ b/src/en/readallmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ReadAllManga'
+ extClass = '.ReadAllManga'
+ themePkg = 'readallcomics'
+ baseUrl = 'https://readallmanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/readallcomics/readallmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/readallmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/readallmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readallmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/readallmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/readallmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/readallmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readallmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/readallmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/readallmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/readallmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readallmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/readallmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readallmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/readallmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readallmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/readallmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readallmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readallcomics/readallmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readallmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readallcomics/readallmanga/src/ReadAllManga.kt b/src/en/readallmanga/src/eu/kanade/tachiyomi/extension/en/readallmanga/ReadAllManga.kt
similarity index 100%
rename from multisrc/overrides/readallcomics/readallmanga/src/ReadAllManga.kt
rename to src/en/readallmanga/src/eu/kanade/tachiyomi/extension/en/readallmanga/ReadAllManga.kt
diff --git a/src/en/readattackontitanshingekinokyojinmanga/build.gradle b/src/en/readattackontitanshingekinokyojinmanga/build.gradle
new file mode 100644
index 000000000..ff2e6e5ce
--- /dev/null
+++ b/src/en/readattackontitanshingekinokyojinmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Attack on Titan Shingeki no Kyojin Manga'
+ extClass = '.ReadAttackOnTitanShingekiNoKyojinManga'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww8.readsnk.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/readattackontitanshingekinokyojinmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readattackontitanshingekinokyojinmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/readattackontitanshingekinokyojinmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readattackontitanshingekinokyojinmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/readattackontitanshingekinokyojinmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readattackontitanshingekinokyojinmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readattackontitanshingekinokyojinmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readattackontitanshingekinokyojinmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readattackontitanshingekinokyojinmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readattackontitanshingekinokyojinmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/src/ReadAttackOnTitanShingekiNoKyojinManga.kt b/src/en/readattackontitanshingekinokyojinmanga/src/eu/kanade/tachiyomi/extension/en/readattackontitanshingekinokyojinmanga/ReadAttackOnTitanShingekiNoKyojinManga.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/src/ReadAttackOnTitanShingekiNoKyojinManga.kt
rename to src/en/readattackontitanshingekinokyojinmanga/src/eu/kanade/tachiyomi/extension/en/readattackontitanshingekinokyojinmanga/ReadAttackOnTitanShingekiNoKyojinManga.kt
diff --git a/src/en/readberserkmanga/build.gradle b/src/en/readberserkmanga/build.gradle
new file mode 100644
index 000000000..37179fe98
--- /dev/null
+++ b/src/en/readberserkmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Berserk Manga'
+ extClass = '.ReadBerserkManga'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://readberserk.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readberserkmanga/src/ReadBerserkManga.kt b/src/en/readberserkmanga/src/eu/kanade/tachiyomi/extension/en/readberserkmanga/ReadBerserkManga.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readberserkmanga/src/ReadBerserkManga.kt
rename to src/en/readberserkmanga/src/eu/kanade/tachiyomi/extension/en/readberserkmanga/ReadBerserkManga.kt
diff --git a/src/en/readblackclovermangaonline/build.gradle b/src/en/readblackclovermangaonline/build.gradle
new file mode 100644
index 000000000..ff3089e8c
--- /dev/null
+++ b/src/en/readblackclovermangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Black Clover Manga Online'
+ extClass = '.ReadBlackCloverMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww7.readblackclover.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readblackclovermangaonline/src/ReadBlackCloverMangaOnline.kt b/src/en/readblackclovermangaonline/src/eu/kanade/tachiyomi/extension/en/readblackclovermangaonline/ReadBlackCloverMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readblackclovermangaonline/src/ReadBlackCloverMangaOnline.kt
rename to src/en/readblackclovermangaonline/src/eu/kanade/tachiyomi/extension/en/readblackclovermangaonline/ReadBlackCloverMangaOnline.kt
diff --git a/src/en/readbokunoheroacademiamyheroacademiamanga/build.gradle b/src/en/readbokunoheroacademiamyheroacademiamanga/build.gradle
new file mode 100644
index 000000000..9ce0db958
--- /dev/null
+++ b/src/en/readbokunoheroacademiamyheroacademiamanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Boku no Hero Academia My Hero Academia Manga'
+ extClass = '.ReadBokuNoHeroAcademiaMyHeroAcademiaManga'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww6.readmha.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/res/mipmap-hdpi/ic_launcher.png b/src/en/readbokunoheroacademiamyheroacademiamanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readbokunoheroacademiamyheroacademiamanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/res/mipmap-mdpi/ic_launcher.png b/src/en/readbokunoheroacademiamyheroacademiamanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readbokunoheroacademiamyheroacademiamanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/readbokunoheroacademiamyheroacademiamanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readbokunoheroacademiamyheroacademiamanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readbokunoheroacademiamyheroacademiamanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readbokunoheroacademiamyheroacademiamanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readbokunoheroacademiamyheroacademiamanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readbokunoheroacademiamyheroacademiamanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/src/ReadBokuNoHeroAcademiaMyHeroAcademiaManga.kt b/src/en/readbokunoheroacademiamyheroacademiamanga/src/eu/kanade/tachiyomi/extension/en/readbokunoheroacademiamyheroacademiamanga/ReadBokuNoHeroAcademiaMyHeroAcademiaManga.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/src/ReadBokuNoHeroAcademiaMyHeroAcademiaManga.kt
rename to src/en/readbokunoheroacademiamyheroacademiamanga/src/eu/kanade/tachiyomi/extension/en/readbokunoheroacademiamyheroacademiamanga/ReadBokuNoHeroAcademiaMyHeroAcademiaManga.kt
diff --git a/src/en/readchainsawmanmangaonline/build.gradle b/src/en/readchainsawmanmangaonline/build.gradle
new file mode 100644
index 000000000..cd79ac4be
--- /dev/null
+++ b/src/en/readchainsawmanmangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Chainsaw Man Manga Online'
+ extClass = '.ReadChainsawManMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww1.readchainsawman.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readchainsawmanmangaonline/src/ReadChainsawManMangaOnline.kt b/src/en/readchainsawmanmangaonline/src/eu/kanade/tachiyomi/extension/en/readchainsawmanmangaonline/ReadChainsawManMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readchainsawmanmangaonline/src/ReadChainsawManMangaOnline.kt
rename to src/en/readchainsawmanmangaonline/src/eu/kanade/tachiyomi/extension/en/readchainsawmanmangaonline/ReadChainsawManMangaOnline.kt
diff --git a/src/en/readcomicsonline/build.gradle b/src/en/readcomicsonline/build.gradle
new file mode 100644
index 000000000..1a8c5c572
--- /dev/null
+++ b/src/en/readcomicsonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Comics Online'
+ extClass = '.ReadComicsOnline'
+ themePkg = 'mmrcms'
+ baseUrl = 'https://readcomicsonline.ru'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mmrcms/readcomicsonline/src/ReadComicsOnline.kt b/src/en/readcomicsonline/src/eu/kanade/tachiyomi/extension/en/readcomicsonline/ReadComicsOnline.kt
similarity index 100%
rename from multisrc/overrides/mmrcms/readcomicsonline/src/ReadComicsOnline.kt
rename to src/en/readcomicsonline/src/eu/kanade/tachiyomi/extension/en/readcomicsonline/ReadComicsOnline.kt
diff --git a/src/en/readdragonballsuperchoumangaonline/build.gradle b/src/en/readdragonballsuperchoumangaonline/build.gradle
new file mode 100644
index 000000000..c536950ba
--- /dev/null
+++ b/src/en/readdragonballsuperchoumangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Dragon Ball Super Chou Manga Online'
+ extClass = '.ReadDragonBallSuperChouMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww6.dbsmanga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readdragonballsuperchoumangaonline/src/ReadDragonBallSuperChouMangaOnline.kt b/src/en/readdragonballsuperchoumangaonline/src/eu/kanade/tachiyomi/extension/en/readdragonballsuperchoumangaonline/ReadDragonBallSuperChouMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readdragonballsuperchoumangaonline/src/ReadDragonBallSuperChouMangaOnline.kt
rename to src/en/readdragonballsuperchoumangaonline/src/eu/kanade/tachiyomi/extension/en/readdragonballsuperchoumangaonline/ReadDragonBallSuperChouMangaOnline.kt
diff --git a/src/en/readdrstonemangaonline/build.gradle b/src/en/readdrstonemangaonline/build.gradle
new file mode 100644
index 000000000..a7b14b853
--- /dev/null
+++ b/src/en/readdrstonemangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Dr. Stone Manga Online'
+ extClass = '.ReadDrStoneMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww3.readdrstone.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readdrstonemangaonline/src/ReadDrStoneMangaOnline.kt b/src/en/readdrstonemangaonline/src/eu/kanade/tachiyomi/extension/en/readdrstonemangaonline/ReadDrStoneMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readdrstonemangaonline/src/ReadDrStoneMangaOnline.kt
rename to src/en/readdrstonemangaonline/src/eu/kanade/tachiyomi/extension/en/readdrstonemangaonline/ReadDrStoneMangaOnline.kt
diff --git a/src/en/readfairytailedenszeromangaonline/build.gradle b/src/en/readfairytailedenszeromangaonline/build.gradle
new file mode 100644
index 000000000..097f41d90
--- /dev/null
+++ b/src/en/readfairytailedenszeromangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Fairy Tail & Edens Zero Manga Online'
+ extClass = '.ReadFairyTailEdensZeroMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww4.readfairytail.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readfairytailedenszeromangaonline/src/ReadFairyTailEdensZeroMangaOnline.kt b/src/en/readfairytailedenszeromangaonline/src/eu/kanade/tachiyomi/extension/en/readfairytailedenszeromangaonline/ReadFairyTailEdensZeroMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readfairytailedenszeromangaonline/src/ReadFairyTailEdensZeroMangaOnline.kt
rename to src/en/readfairytailedenszeromangaonline/src/eu/kanade/tachiyomi/extension/en/readfairytailedenszeromangaonline/ReadFairyTailEdensZeroMangaOnline.kt
diff --git a/src/en/readfreecomics/build.gradle b/src/en/readfreecomics/build.gradle
new file mode 100644
index 000000000..0ecba5f96
--- /dev/null
+++ b/src/en/readfreecomics/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ReadFreeComics'
+ extClass = '.ReadFreeComics'
+ themePkg = 'madara'
+ baseUrl = 'https://readfreecomics.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/readfreecomics/res/mipmap-hdpi/ic_launcher.png b/src/en/readfreecomics/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readfreecomics/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readfreecomics/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readfreecomics/res/mipmap-mdpi/ic_launcher.png b/src/en/readfreecomics/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readfreecomics/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readfreecomics/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readfreecomics/res/mipmap-xhdpi/ic_launcher.png b/src/en/readfreecomics/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readfreecomics/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readfreecomics/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readfreecomics/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readfreecomics/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readfreecomics/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readfreecomics/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readfreecomics/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readfreecomics/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readfreecomics/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readfreecomics/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readfreecomics/src/ReadFreeComics.kt b/src/en/readfreecomics/src/eu/kanade/tachiyomi/extension/en/readfreecomics/ReadFreeComics.kt
similarity index 100%
rename from multisrc/overrides/madara/readfreecomics/src/ReadFreeComics.kt
rename to src/en/readfreecomics/src/eu/kanade/tachiyomi/extension/en/readfreecomics/ReadFreeComics.kt
diff --git a/src/en/readgoblinslayermangaonline/build.gradle b/src/en/readgoblinslayermangaonline/build.gradle
new file mode 100644
index 000000000..dfaca280b
--- /dev/null
+++ b/src/en/readgoblinslayermangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Goblin Slayer Manga Online'
+ extClass = '.ReadGoblinSlayerMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://manga.watchgoblinslayer.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readgoblinslayermangaonline/src/ReadGoblinSlayerMangaOnline.kt b/src/en/readgoblinslayermangaonline/src/eu/kanade/tachiyomi/extension/en/readgoblinslayermangaonline/ReadGoblinSlayerMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readgoblinslayermangaonline/src/ReadGoblinSlayerMangaOnline.kt
rename to src/en/readgoblinslayermangaonline/src/eu/kanade/tachiyomi/extension/en/readgoblinslayermangaonline/ReadGoblinSlayerMangaOnline.kt
diff --git a/src/en/readgojo/build.gradle b/src/en/readgojo/build.gradle
new file mode 100644
index 000000000..1f5cd7873
--- /dev/null
+++ b/src/en/readgojo/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ReadGojo'
+ extClass = '.ReadGojo'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://readgojo.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/readgojo/res/mipmap-hdpi/ic_launcher.png b/src/en/readgojo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/readgojo/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readgojo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/readgojo/res/mipmap-mdpi/ic_launcher.png b/src/en/readgojo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/readgojo/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readgojo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/readgojo/res/mipmap-xhdpi/ic_launcher.png b/src/en/readgojo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/readgojo/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readgojo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/readgojo/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readgojo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/readgojo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readgojo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/readgojo/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readgojo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/readgojo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readgojo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/readgojo/src/ReadGojo.kt b/src/en/readgojo/src/eu/kanade/tachiyomi/extension/en/readgojo/ReadGojo.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/readgojo/src/ReadGojo.kt
rename to src/en/readgojo/src/eu/kanade/tachiyomi/extension/en/readgojo/ReadGojo.kt
diff --git a/src/en/readhaikyuumangaonline/build.gradle b/src/en/readhaikyuumangaonline/build.gradle
new file mode 100644
index 000000000..9f30a430f
--- /dev/null
+++ b/src/en/readhaikyuumangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Haikyuu!! Manga Online'
+ extClass = '.ReadHaikyuuMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww6.readhaikyuu.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readhaikyuumangaonline/src/ReadHaikyuuMangaOnline.kt b/src/en/readhaikyuumangaonline/src/eu/kanade/tachiyomi/extension/en/readhaikyuumangaonline/ReadHaikyuuMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readhaikyuumangaonline/src/ReadHaikyuuMangaOnline.kt
rename to src/en/readhaikyuumangaonline/src/eu/kanade/tachiyomi/extension/en/readhaikyuumangaonline/ReadHaikyuuMangaOnline.kt
diff --git a/src/en/readhunterxhuntermangaonline/build.gradle b/src/en/readhunterxhuntermangaonline/build.gradle
new file mode 100644
index 000000000..d6b08828d
--- /dev/null
+++ b/src/en/readhunterxhuntermangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Hunter x Hunter Manga Online'
+ extClass = '.ReadHunterxHunterMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww2.readhxh.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/res/mipmap-hdpi/ic_launcher.png b/src/en/readhunterxhuntermangaonline/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readhunterxhuntermangaonline/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/res/mipmap-mdpi/ic_launcher.png b/src/en/readhunterxhuntermangaonline/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readhunterxhuntermangaonline/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/res/mipmap-xhdpi/ic_launcher.png b/src/en/readhunterxhuntermangaonline/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readhunterxhuntermangaonline/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readhunterxhuntermangaonline/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readhunterxhuntermangaonline/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readhunterxhuntermangaonline/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readhunterxhuntermangaonline/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/src/ReadHunterxHunterMangaOnline.kt b/src/en/readhunterxhuntermangaonline/src/eu/kanade/tachiyomi/extension/en/readhunterxhuntermangaonline/ReadHunterxHunterMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/src/ReadHunterxHunterMangaOnline.kt
rename to src/en/readhunterxhuntermangaonline/src/eu/kanade/tachiyomi/extension/en/readhunterxhuntermangaonline/ReadHunterxHunterMangaOnline.kt
diff --git a/src/en/readjujutsukaisenmangaonline/build.gradle b/src/en/readjujutsukaisenmangaonline/build.gradle
new file mode 100644
index 000000000..778291e28
--- /dev/null
+++ b/src/en/readjujutsukaisenmangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Jujutsu Kaisen Manga Online'
+ extClass = '.ReadJujutsuKaisenMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww1.readjujutsukaisen.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/res/mipmap-hdpi/ic_launcher.png b/src/en/readjujutsukaisenmangaonline/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readjujutsukaisenmangaonline/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/res/mipmap-mdpi/ic_launcher.png b/src/en/readjujutsukaisenmangaonline/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readjujutsukaisenmangaonline/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/res/mipmap-xhdpi/ic_launcher.png b/src/en/readjujutsukaisenmangaonline/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readjujutsukaisenmangaonline/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readjujutsukaisenmangaonline/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readjujutsukaisenmangaonline/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readjujutsukaisenmangaonline/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readjujutsukaisenmangaonline/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/src/ReadJujutsuKaisenMangaOnline.kt b/src/en/readjujutsukaisenmangaonline/src/eu/kanade/tachiyomi/extension/en/readjujutsukaisenmangaonline/ReadJujutsuKaisenMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/src/ReadJujutsuKaisenMangaOnline.kt
rename to src/en/readjujutsukaisenmangaonline/src/eu/kanade/tachiyomi/extension/en/readjujutsukaisenmangaonline/ReadJujutsuKaisenMangaOnline.kt
diff --git a/src/en/readkaguyasamamangaonline/build.gradle b/src/en/readkaguyasamamangaonline/build.gradle
new file mode 100644
index 000000000..d284551c3
--- /dev/null
+++ b/src/en/readkaguyasamamangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Kaguya-sama Manga Online'
+ extClass = '.ReadKaguyaSamaMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww1.readkaguyasama.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readkaguyasamamangaonline/res/mipmap-hdpi/ic_launcher.png b/src/en/readkaguyasamamangaonline/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readkaguyasamamangaonline/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readkaguyasamamangaonline/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readkaguyasamamangaonline/res/mipmap-mdpi/ic_launcher.png b/src/en/readkaguyasamamangaonline/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readkaguyasamamangaonline/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readkaguyasamamangaonline/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readkaguyasamamangaonline/res/mipmap-xhdpi/ic_launcher.png b/src/en/readkaguyasamamangaonline/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readkaguyasamamangaonline/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readkaguyasamamangaonline/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readkaguyasamamangaonline/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readkaguyasamamangaonline/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readkaguyasamamangaonline/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readkaguyasamamangaonline/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readkaguyasamamangaonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readkaguyasamamangaonline/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readkaguyasamamangaonline/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readkaguyasamamangaonline/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readkaguyasamamangaonline/src/ReadKaguyaSamaMangaOnline.kt b/src/en/readkaguyasamamangaonline/src/eu/kanade/tachiyomi/extension/en/readkaguyasamamangaonline/ReadKaguyaSamaMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readkaguyasamamangaonline/src/ReadKaguyaSamaMangaOnline.kt
rename to src/en/readkaguyasamamangaonline/src/eu/kanade/tachiyomi/extension/en/readkaguyasamamangaonline/ReadKaguyaSamaMangaOnline.kt
diff --git a/src/en/readkingdommangaonline/build.gradle b/src/en/readkingdommangaonline/build.gradle
new file mode 100644
index 000000000..dd5326f79
--- /dev/null
+++ b/src/en/readkingdommangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Kingdom Manga Online'
+ extClass = '.ReadKingdomMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww2.readkingdom.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readkingdommangaonline/src/ReadKingdomMangaOnline.kt b/src/en/readkingdommangaonline/src/eu/kanade/tachiyomi/extension/en/readkingdommangaonline/ReadKingdomMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readkingdommangaonline/src/ReadKingdomMangaOnline.kt
rename to src/en/readkingdommangaonline/src/eu/kanade/tachiyomi/extension/en/readkingdommangaonline/ReadKingdomMangaOnline.kt
diff --git a/src/en/readkomik/build.gradle b/src/en/readkomik/build.gradle
new file mode 100644
index 000000000..21e66b247
--- /dev/null
+++ b/src/en/readkomik/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Readkomik'
+ extClass = '.ReadKomik'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://readkomik.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/readkomik/res/mipmap-hdpi/ic_launcher.png b/src/en/readkomik/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/readkomik/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readkomik/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/readkomik/res/mipmap-mdpi/ic_launcher.png b/src/en/readkomik/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/readkomik/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readkomik/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/readkomik/res/mipmap-xhdpi/ic_launcher.png b/src/en/readkomik/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/readkomik/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readkomik/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/readkomik/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readkomik/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/readkomik/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readkomik/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/readkomik/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readkomik/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/readkomik/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readkomik/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/readkomik/src/ReadKomik.kt b/src/en/readkomik/src/eu/kanade/tachiyomi/extension/en/readkomik/ReadKomik.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/readkomik/src/ReadKomik.kt
rename to src/en/readkomik/src/eu/kanade/tachiyomi/extension/en/readkomik/ReadKomik.kt
diff --git a/src/en/readmangafree/build.gradle b/src/en/readmangafree/build.gradle
new file mode 100644
index 000000000..00726ccb8
--- /dev/null
+++ b/src/en/readmangafree/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ReadMangaFree'
+ extClass = '.ReadMangaFree'
+ themePkg = 'madara'
+ baseUrl = 'https://readmangafree.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/readmangafree/res/mipmap-hdpi/ic_launcher.png b/src/en/readmangafree/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readmangafree/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readmangafree/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readmangafree/res/mipmap-mdpi/ic_launcher.png b/src/en/readmangafree/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readmangafree/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readmangafree/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readmangafree/res/mipmap-xhdpi/ic_launcher.png b/src/en/readmangafree/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readmangafree/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readmangafree/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readmangafree/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readmangafree/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readmangafree/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readmangafree/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readmangafree/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readmangafree/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readmangafree/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readmangafree/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readmangafree/src/ReadMangaFree.kt b/src/en/readmangafree/src/eu/kanade/tachiyomi/extension/en/readmangafree/ReadMangaFree.kt
similarity index 100%
rename from multisrc/overrides/madara/readmangafree/src/ReadMangaFree.kt
rename to src/en/readmangafree/src/eu/kanade/tachiyomi/extension/en/readmangafree/ReadMangaFree.kt
diff --git a/src/en/readmanhua/build.gradle b/src/en/readmanhua/build.gradle
new file mode 100644
index 000000000..2fc31403e
--- /dev/null
+++ b/src/en/readmanhua/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ReadManhua'
+ extClass = '.ReadManhua'
+ themePkg = 'madara'
+ baseUrl = 'https://readmanhua.net'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/readmanhua/res/mipmap-hdpi/ic_launcher.png b/src/en/readmanhua/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readmanhua/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readmanhua/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readmanhua/res/mipmap-mdpi/ic_launcher.png b/src/en/readmanhua/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readmanhua/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readmanhua/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readmanhua/res/mipmap-xhdpi/ic_launcher.png b/src/en/readmanhua/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readmanhua/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readmanhua/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readmanhua/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readmanhua/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readmanhua/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readmanhua/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readmanhua/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readmanhua/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readmanhua/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readmanhua/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readmanhua/src/ReadManhua.kt b/src/en/readmanhua/src/eu/kanade/tachiyomi/extension/en/readmanhua/ReadManhua.kt
similarity index 100%
rename from multisrc/overrides/madara/readmanhua/src/ReadManhua.kt
rename to src/en/readmanhua/src/eu/kanade/tachiyomi/extension/en/readmanhua/ReadManhua.kt
diff --git a/src/en/readnanatsunotaizai7deadlysinsmangaonline/build.gradle b/src/en/readnanatsunotaizai7deadlysinsmangaonline/build.gradle
new file mode 100644
index 000000000..ac188f340
--- /dev/null
+++ b/src/en/readnanatsunotaizai7deadlysinsmangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Nanatsu no Taizai 7 Deadly Sins Manga Online'
+ extClass = '.ReadNanatsuNoTaizai7DeadlySinsMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww3.read7deadlysins.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-hdpi/ic_launcher.png b/src/en/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-mdpi/ic_launcher.png b/src/en/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-xhdpi/ic_launcher.png b/src/en/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readnanatsunotaizai7deadlysinsmangaonline/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/src/ReadNanatsuNoTaizai7DeadlySinsMangaOnline.kt b/src/en/readnanatsunotaizai7deadlysinsmangaonline/src/eu/kanade/tachiyomi/extension/en/readnanatsunotaizai7deadlysinsmangaonline/ReadNanatsuNoTaizai7DeadlySinsMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/src/ReadNanatsuNoTaizai7DeadlySinsMangaOnline.kt
rename to src/en/readnanatsunotaizai7deadlysinsmangaonline/src/eu/kanade/tachiyomi/extension/en/readnanatsunotaizai7deadlysinsmangaonline/ReadNanatsuNoTaizai7DeadlySinsMangaOnline.kt
diff --git a/src/en/readnarutoborutosamurai8mangaonline/build.gradle b/src/en/readnarutoborutosamurai8mangaonline/build.gradle
new file mode 100644
index 000000000..f34dbcf83
--- /dev/null
+++ b/src/en/readnarutoborutosamurai8mangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Naruto Boruto Samurai 8 Manga Online'
+ extClass = '.ReadNarutoBorutoSamurai8MangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww7.readnaruto.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readnarutoborutosamurai8mangaonline/src/ReadNarutoBorutoSamurai8MangaOnline.kt b/src/en/readnarutoborutosamurai8mangaonline/src/eu/kanade/tachiyomi/extension/en/readnarutoborutosamurai8mangaonline/ReadNarutoBorutoSamurai8MangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readnarutoborutosamurai8mangaonline/src/ReadNarutoBorutoSamurai8MangaOnline.kt
rename to src/en/readnarutoborutosamurai8mangaonline/src/eu/kanade/tachiyomi/extension/en/readnarutoborutosamurai8mangaonline/ReadNarutoBorutoSamurai8MangaOnline.kt
diff --git a/src/en/readnoblessemanhwaonline/build.gradle b/src/en/readnoblessemanhwaonline/build.gradle
new file mode 100644
index 000000000..c9ec70f96
--- /dev/null
+++ b/src/en/readnoblessemanhwaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Noblesse Manhwa Online'
+ extClass = '.ReadNoblesseManhwaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww2.readnoblesse.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readnoblessemanhwaonline/src/ReadNoblesseManhwaOnline.kt b/src/en/readnoblessemanhwaonline/src/eu/kanade/tachiyomi/extension/en/readnoblessemanhwaonline/ReadNoblesseManhwaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readnoblessemanhwaonline/src/ReadNoblesseManhwaOnline.kt
rename to src/en/readnoblessemanhwaonline/src/eu/kanade/tachiyomi/extension/en/readnoblessemanhwaonline/ReadNoblesseManhwaOnline.kt
diff --git a/src/en/readonepiecemangaonline/build.gradle b/src/en/readonepiecemangaonline/build.gradle
new file mode 100644
index 000000000..ebde270d7
--- /dev/null
+++ b/src/en/readonepiecemangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read One Piece Manga Online'
+ extClass = '.ReadOnePieceMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww8.readonepiece.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readonepiecemangaonline/src/ReadOnePieceMangaOnline.kt b/src/en/readonepiecemangaonline/src/eu/kanade/tachiyomi/extension/en/readonepiecemangaonline/ReadOnePieceMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readonepiecemangaonline/src/ReadOnePieceMangaOnline.kt
rename to src/en/readonepiecemangaonline/src/eu/kanade/tachiyomi/extension/en/readonepiecemangaonline/ReadOnePieceMangaOnline.kt
diff --git a/src/en/readonepunchmanmangaonlinetwo/build.gradle b/src/en/readonepunchmanmangaonlinetwo/build.gradle
new file mode 100644
index 000000000..68c368b3c
--- /dev/null
+++ b/src/en/readonepunchmanmangaonlinetwo/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read One-Punch Man Manga Online'
+ extClass = '.ReadOnePunchManMangaOnlineTwo'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww3.readopm.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/res/mipmap-hdpi/ic_launcher.png b/src/en/readonepunchmanmangaonlinetwo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readonepunchmanmangaonlinetwo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/res/mipmap-mdpi/ic_launcher.png b/src/en/readonepunchmanmangaonlinetwo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readonepunchmanmangaonlinetwo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/res/mipmap-xhdpi/ic_launcher.png b/src/en/readonepunchmanmangaonlinetwo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readonepunchmanmangaonlinetwo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readonepunchmanmangaonlinetwo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readonepunchmanmangaonlinetwo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readonepunchmanmangaonlinetwo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readonepunchmanmangaonlinetwo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/src/ReadOnePunchManMangaOnlineTwo.kt b/src/en/readonepunchmanmangaonlinetwo/src/eu/kanade/tachiyomi/extension/en/readonepunchmanmangaonlinetwo/ReadOnePunchManMangaOnlineTwo.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/src/ReadOnePunchManMangaOnlineTwo.kt
rename to src/en/readonepunchmanmangaonlinetwo/src/eu/kanade/tachiyomi/extension/en/readonepunchmanmangaonlinetwo/ReadOnePunchManMangaOnlineTwo.kt
diff --git a/src/en/readsololevelingmangamanhwaonline/build.gradle b/src/en/readsololevelingmangamanhwaonline/build.gradle
new file mode 100644
index 000000000..99ef1f8f5
--- /dev/null
+++ b/src/en/readsololevelingmangamanhwaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Solo Leveling Manga Manhwa Online'
+ extClass = '.ReadSoloLevelingMangaManhwaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://readsololeveling.org'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/res/mipmap-hdpi/ic_launcher.png b/src/en/readsololevelingmangamanhwaonline/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readsololevelingmangamanhwaonline/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/res/mipmap-mdpi/ic_launcher.png b/src/en/readsololevelingmangamanhwaonline/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readsololevelingmangamanhwaonline/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/res/mipmap-xhdpi/ic_launcher.png b/src/en/readsololevelingmangamanhwaonline/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readsololevelingmangamanhwaonline/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readsololevelingmangamanhwaonline/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readsololevelingmangamanhwaonline/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readsololevelingmangamanhwaonline/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readsololevelingmangamanhwaonline/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/src/ReadSoloLevelingMangaManhwaOnline.kt b/src/en/readsololevelingmangamanhwaonline/src/eu/kanade/tachiyomi/extension/en/readsololevelingmangamanhwaonline/ReadSoloLevelingMangaManhwaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/src/ReadSoloLevelingMangaManhwaOnline.kt
rename to src/en/readsololevelingmangamanhwaonline/src/eu/kanade/tachiyomi/extension/en/readsololevelingmangamanhwaonline/ReadSoloLevelingMangaManhwaOnline.kt
diff --git a/src/en/readthepromisedneverlandmangaonline/build.gradle b/src/en/readthepromisedneverlandmangaonline/build.gradle
new file mode 100644
index 000000000..88179d2be
--- /dev/null
+++ b/src/en/readthepromisedneverlandmangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read The Promised Neverland Manga Online'
+ extClass = '.ReadThePromisedNeverlandMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww3.readneverland.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/res/mipmap-hdpi/ic_launcher.png b/src/en/readthepromisedneverlandmangaonline/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readthepromisedneverlandmangaonline/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/res/mipmap-mdpi/ic_launcher.png b/src/en/readthepromisedneverlandmangaonline/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readthepromisedneverlandmangaonline/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/res/mipmap-xhdpi/ic_launcher.png b/src/en/readthepromisedneverlandmangaonline/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readthepromisedneverlandmangaonline/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readthepromisedneverlandmangaonline/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readthepromisedneverlandmangaonline/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readthepromisedneverlandmangaonline/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readthepromisedneverlandmangaonline/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/src/ReadThePromisedNeverlandMangaOnline.kt b/src/en/readthepromisedneverlandmangaonline/src/eu/kanade/tachiyomi/extension/en/readthepromisedneverlandmangaonline/ReadThePromisedNeverlandMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/src/ReadThePromisedNeverlandMangaOnline.kt
rename to src/en/readthepromisedneverlandmangaonline/src/eu/kanade/tachiyomi/extension/en/readthepromisedneverlandmangaonline/ReadThePromisedNeverlandMangaOnline.kt
diff --git a/src/en/readtokyoghoulretokyoghoulmangaonline/build.gradle b/src/en/readtokyoghoulretokyoghoulmangaonline/build.gradle
new file mode 100644
index 000000000..c2c6292c0
--- /dev/null
+++ b/src/en/readtokyoghoulretokyoghoulmangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Tokyo Ghoul Re & Tokyo Ghoul Manga Online'
+ extClass = '.ReadTokyoGhoulReTokyoGhoulMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww8.tokyoghoulre.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/res/mipmap-hdpi/ic_launcher.png b/src/en/readtokyoghoulretokyoghoulmangaonline/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readtokyoghoulretokyoghoulmangaonline/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/res/mipmap-mdpi/ic_launcher.png b/src/en/readtokyoghoulretokyoghoulmangaonline/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readtokyoghoulretokyoghoulmangaonline/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/res/mipmap-xhdpi/ic_launcher.png b/src/en/readtokyoghoulretokyoghoulmangaonline/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readtokyoghoulretokyoghoulmangaonline/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readtokyoghoulretokyoghoulmangaonline/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readtokyoghoulretokyoghoulmangaonline/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readtokyoghoulretokyoghoulmangaonline/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readtokyoghoulretokyoghoulmangaonline/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/src/ReadTokyoGhoulReTokyoGhoulMangaOnline.kt b/src/en/readtokyoghoulretokyoghoulmangaonline/src/eu/kanade/tachiyomi/extension/en/readtokyoghoulretokyoghoulmangaonline/ReadTokyoGhoulReTokyoGhoulMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/src/ReadTokyoGhoulReTokyoGhoulMangaOnline.kt
rename to src/en/readtokyoghoulretokyoghoulmangaonline/src/eu/kanade/tachiyomi/extension/en/readtokyoghoulretokyoghoulmangaonline/ReadTokyoGhoulReTokyoGhoulMangaOnline.kt
diff --git a/src/en/readtowerofgodmanhwamangaonline/build.gradle b/src/en/readtowerofgodmanhwamangaonline/build.gradle
new file mode 100644
index 000000000..26595bdec
--- /dev/null
+++ b/src/en/readtowerofgodmanhwamangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Tower of God Manhwa Manga Online'
+ extClass = '.ReadTowerOfGodManhwaMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww1.readtowerofgod.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/res/mipmap-hdpi/ic_launcher.png b/src/en/readtowerofgodmanhwamangaonline/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/res/mipmap-hdpi/ic_launcher.png
rename to src/en/readtowerofgodmanhwamangaonline/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/res/mipmap-mdpi/ic_launcher.png b/src/en/readtowerofgodmanhwamangaonline/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/res/mipmap-mdpi/ic_launcher.png
rename to src/en/readtowerofgodmanhwamangaonline/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/res/mipmap-xhdpi/ic_launcher.png b/src/en/readtowerofgodmanhwamangaonline/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/readtowerofgodmanhwamangaonline/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/res/mipmap-xxhdpi/ic_launcher.png b/src/en/readtowerofgodmanhwamangaonline/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/readtowerofgodmanhwamangaonline/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/readtowerofgodmanhwamangaonline/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/readtowerofgodmanhwamangaonline/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/src/ReadTowerOfGodManhwaMangaOnline.kt b/src/en/readtowerofgodmanhwamangaonline/src/eu/kanade/tachiyomi/extension/en/readtowerofgodmanhwamangaonline/ReadTowerOfGodManhwaMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/src/ReadTowerOfGodManhwaMangaOnline.kt
rename to src/en/readtowerofgodmanhwamangaonline/src/eu/kanade/tachiyomi/extension/en/readtowerofgodmanhwamangaonline/ReadTowerOfGodManhwaMangaOnline.kt
diff --git a/src/en/readvinlandsagamangaonline/build.gradle b/src/en/readvinlandsagamangaonline/build.gradle
new file mode 100644
index 000000000..6fe7f5fee
--- /dev/null
+++ b/src/en/readvinlandsagamangaonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Read Vinland Saga Manga Online'
+ extClass = '.ReadVinlandSagaMangaOnline'
+ themePkg = 'mangacatalog'
+ baseUrl = 'https://ww1.readvinlandsaga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangacatalog/readvinlandsagamangaonline/src/ReadVinlandSagaMangaOnline.kt b/src/en/readvinlandsagamangaonline/src/eu/kanade/tachiyomi/extension/en/readvinlandsagamangaonline/ReadVinlandSagaMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/mangacatalog/readvinlandsagamangaonline/src/ReadVinlandSagaMangaOnline.kt
rename to src/en/readvinlandsagamangaonline/src/eu/kanade/tachiyomi/extension/en/readvinlandsagamangaonline/ReadVinlandSagaMangaOnline.kt
diff --git a/src/en/resetscans/build.gradle b/src/en/resetscans/build.gradle
new file mode 100644
index 000000000..083147acf
--- /dev/null
+++ b/src/en/resetscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Reset Scans'
+ extClass = '.ResetScans'
+ themePkg = 'madara'
+ baseUrl = 'https://reset-scans.us'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/resetscans/res/mipmap-hdpi/ic_launcher.png b/src/en/resetscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/resetscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/resetscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/resetscans/res/mipmap-mdpi/ic_launcher.png b/src/en/resetscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/resetscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/resetscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/resetscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/resetscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/resetscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/resetscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/resetscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/resetscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/resetscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/resetscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/resetscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/resetscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/resetscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/resetscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/resetscans/src/ResetScans.kt b/src/en/resetscans/src/eu/kanade/tachiyomi/extension/en/resetscans/ResetScans.kt
similarity index 100%
rename from multisrc/overrides/madara/resetscans/src/ResetScans.kt
rename to src/en/resetscans/src/eu/kanade/tachiyomi/extension/en/resetscans/ResetScans.kt
diff --git a/src/en/rio2manga/build.gradle b/src/en/rio2manga/build.gradle
new file mode 100644
index 000000000..b5a4cd1a3
--- /dev/null
+++ b/src/en/rio2manga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Rio2 Manga'
+ extClass = '.Rio2Manga'
+ themePkg = 'madara'
+ baseUrl = 'https://rio2manga.net'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/rio2manga/res/mipmap-hdpi/ic_launcher.png b/src/en/rio2manga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rio2manga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/rio2manga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rio2manga/res/mipmap-mdpi/ic_launcher.png b/src/en/rio2manga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rio2manga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/rio2manga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rio2manga/res/mipmap-xhdpi/ic_launcher.png b/src/en/rio2manga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rio2manga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/rio2manga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rio2manga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/rio2manga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rio2manga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/rio2manga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rio2manga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/rio2manga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rio2manga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/rio2manga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rio2manga/src/Rio2Manga.kt b/src/en/rio2manga/src/eu/kanade/tachiyomi/extension/en/rio2manga/Rio2Manga.kt
similarity index 100%
rename from multisrc/overrides/madara/rio2manga/src/Rio2Manga.kt
rename to src/en/rio2manga/src/eu/kanade/tachiyomi/extension/en/rio2manga/Rio2Manga.kt
diff --git a/src/en/s2manga/build.gradle b/src/en/s2manga/build.gradle
new file mode 100644
index 000000000..48d0601e2
--- /dev/null
+++ b/src/en/s2manga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'S2Manga'
+ extClass = '.S2Manga'
+ themePkg = 'madara'
+ baseUrl = 'https://www.s2manga.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/s2manga/res/mipmap-hdpi/ic_launcher.png b/src/en/s2manga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/s2manga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/s2manga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/s2manga/res/mipmap-mdpi/ic_launcher.png b/src/en/s2manga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/s2manga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/s2manga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/s2manga/res/mipmap-xhdpi/ic_launcher.png b/src/en/s2manga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/s2manga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/s2manga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/s2manga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/s2manga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/s2manga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/s2manga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/s2manga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/s2manga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/s2manga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/s2manga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/s2manga/src/S2Manga.kt b/src/en/s2manga/src/eu/kanade/tachiyomi/extension/en/s2manga/S2Manga.kt
similarity index 100%
rename from multisrc/overrides/madara/s2manga/src/S2Manga.kt
rename to src/en/s2manga/src/eu/kanade/tachiyomi/extension/en/s2manga/S2Manga.kt
diff --git a/src/en/sawamics/build.gradle b/src/en/sawamics/build.gradle
new file mode 100644
index 000000000..15cd7669f
--- /dev/null
+++ b/src/en/sawamics/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sawamics'
+ extClass = '.Sawamics'
+ themePkg = 'madara'
+ baseUrl = 'https://sawamics.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/sawamics/res/mipmap-hdpi/ic_launcher.png b/src/en/sawamics/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sawamics/res/mipmap-hdpi/ic_launcher.png
rename to src/en/sawamics/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sawamics/res/mipmap-mdpi/ic_launcher.png b/src/en/sawamics/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sawamics/res/mipmap-mdpi/ic_launcher.png
rename to src/en/sawamics/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sawamics/res/mipmap-xhdpi/ic_launcher.png b/src/en/sawamics/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sawamics/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/sawamics/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sawamics/res/mipmap-xxhdpi/ic_launcher.png b/src/en/sawamics/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sawamics/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/sawamics/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sawamics/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/sawamics/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sawamics/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/sawamics/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/sawamics/src/eu/kanade/tachiyomi/extension/en/sawamics/Sawamics.kt b/src/en/sawamics/src/eu/kanade/tachiyomi/extension/en/sawamics/Sawamics.kt
new file mode 100644
index 000000000..8985efcf3
--- /dev/null
+++ b/src/en/sawamics/src/eu/kanade/tachiyomi/extension/en/sawamics/Sawamics.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.sawamics
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Sawamics : Madara("Sawamics", "https://sawamics.com", "en")
diff --git a/src/en/scyllascans/build.gradle b/src/en/scyllascans/build.gradle
new file mode 100644
index 000000000..53f908fb6
--- /dev/null
+++ b/src/en/scyllascans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Scylla Scans'
+ extClass = '.ScyllaScans'
+ themePkg = 'readerfront'
+ baseUrl = 'https://scyllascans.org'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/readerfront/scyllascans/res/mipmap-hdpi/ic_launcher.png b/src/en/scyllascans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readerfront/scyllascans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/scyllascans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/readerfront/scyllascans/res/mipmap-mdpi/ic_launcher.png b/src/en/scyllascans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readerfront/scyllascans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/scyllascans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/readerfront/scyllascans/res/mipmap-xhdpi/ic_launcher.png b/src/en/scyllascans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readerfront/scyllascans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/scyllascans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readerfront/scyllascans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/scyllascans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readerfront/scyllascans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/scyllascans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readerfront/scyllascans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/scyllascans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/readerfront/scyllascans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/scyllascans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/readerfront/scyllascans/src/ScyllaScans.kt b/src/en/scyllascans/src/eu/kanade/tachiyomi/extension/en/scyllascans/ScyllaScans.kt
similarity index 100%
rename from multisrc/overrides/readerfront/scyllascans/src/ScyllaScans.kt
rename to src/en/scyllascans/src/eu/kanade/tachiyomi/extension/en/scyllascans/ScyllaScans.kt
diff --git a/src/en/sectscans/build.gradle b/src/en/sectscans/build.gradle
new file mode 100644
index 000000000..617569075
--- /dev/null
+++ b/src/en/sectscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'SectScans'
+ extClass = '.SectScans'
+ themePkg = 'madara'
+ baseUrl = 'https://sectscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/sectscans/res/mipmap-hdpi/ic_launcher.png b/src/en/sectscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sectscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/sectscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sectscans/res/mipmap-mdpi/ic_launcher.png b/src/en/sectscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sectscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/sectscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sectscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/sectscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sectscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/sectscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sectscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/sectscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sectscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/sectscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sectscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/sectscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sectscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/sectscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sectscans/src/SectScans.kt b/src/en/sectscans/src/eu/kanade/tachiyomi/extension/en/sectscans/SectScans.kt
similarity index 100%
rename from multisrc/overrides/madara/sectscans/src/SectScans.kt
rename to src/en/sectscans/src/eu/kanade/tachiyomi/extension/en/sectscans/SectScans.kt
diff --git a/src/en/setsuscans/build.gradle b/src/en/setsuscans/build.gradle
new file mode 100644
index 000000000..5586f4098
--- /dev/null
+++ b/src/en/setsuscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Setsu Scans'
+ extClass = '.SetsuScans'
+ themePkg = 'madara'
+ baseUrl = 'https://setsuscans.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/setsuscans/res/mipmap-hdpi/ic_launcher.png b/src/en/setsuscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/setsuscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/setsuscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/setsuscans/res/mipmap-mdpi/ic_launcher.png b/src/en/setsuscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/setsuscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/setsuscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/setsuscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/setsuscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/setsuscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/setsuscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/setsuscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/setsuscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/setsuscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/setsuscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/setsuscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/setsuscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/setsuscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/setsuscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/setsuscans/src/SetsuScans.kt b/src/en/setsuscans/src/eu/kanade/tachiyomi/extension/en/setsuscans/SetsuScans.kt
similarity index 100%
rename from multisrc/overrides/madara/setsuscans/src/SetsuScans.kt
rename to src/en/setsuscans/src/eu/kanade/tachiyomi/extension/en/setsuscans/SetsuScans.kt
diff --git a/src/en/shibamanga/build.gradle b/src/en/shibamanga/build.gradle
new file mode 100644
index 000000000..3d0351a2f
--- /dev/null
+++ b/src/en/shibamanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Shiba Manga'
+ extClass = '.ShibaManga'
+ themePkg = 'madara'
+ baseUrl = 'https://shibamanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/shibamanga/res/mipmap-hdpi/ic_launcher.png b/src/en/shibamanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shibamanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/shibamanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shibamanga/res/mipmap-mdpi/ic_launcher.png b/src/en/shibamanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shibamanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/shibamanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shibamanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/shibamanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shibamanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/shibamanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shibamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/shibamanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shibamanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/shibamanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shibamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/shibamanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shibamanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/shibamanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shibamanga/src/ShibaManga.kt b/src/en/shibamanga/src/eu/kanade/tachiyomi/extension/en/shibamanga/ShibaManga.kt
similarity index 100%
rename from multisrc/overrides/madara/shibamanga/src/ShibaManga.kt
rename to src/en/shibamanga/src/eu/kanade/tachiyomi/extension/en/shibamanga/ShibaManga.kt
diff --git a/src/en/shieldmanga/build.gradle b/src/en/shieldmanga/build.gradle
new file mode 100644
index 000000000..358ca936a
--- /dev/null
+++ b/src/en/shieldmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Shield Manga'
+ extClass = '.ShieldManga'
+ themePkg = 'madara'
+ baseUrl = 'https://shieldmanga.io'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/shieldmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/shieldmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shieldmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/shieldmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shieldmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/shieldmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shieldmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/shieldmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shieldmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/shieldmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shieldmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/shieldmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shieldmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/shieldmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shieldmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/shieldmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shieldmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/shieldmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shieldmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/shieldmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shieldmanga/src/ShieldManga.kt b/src/en/shieldmanga/src/eu/kanade/tachiyomi/extension/en/shieldmanga/ShieldManga.kt
similarity index 100%
rename from multisrc/overrides/madara/shieldmanga/src/ShieldManga.kt
rename to src/en/shieldmanga/src/eu/kanade/tachiyomi/extension/en/shieldmanga/ShieldManga.kt
diff --git a/src/en/shootingstarscans/build.gradle b/src/en/shootingstarscans/build.gradle
new file mode 100644
index 000000000..c126c6bff
--- /dev/null
+++ b/src/en/shootingstarscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Shooting Star Scans'
+ extClass = '.ShootingStarScans'
+ themePkg = 'madara'
+ baseUrl = 'https://shootingstarscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/shootingstarscans/res/mipmap-hdpi/ic_launcher.png b/src/en/shootingstarscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shootingstarscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/shootingstarscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shootingstarscans/res/mipmap-mdpi/ic_launcher.png b/src/en/shootingstarscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shootingstarscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/shootingstarscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shootingstarscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/shootingstarscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shootingstarscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/shootingstarscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shootingstarscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/shootingstarscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shootingstarscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/shootingstarscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shootingstarscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/shootingstarscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shootingstarscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/shootingstarscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/shootingstarscans/src/eu/kanade/tachiyomi/extension/en/shootingstarscans/ShootingStarScans.kt b/src/en/shootingstarscans/src/eu/kanade/tachiyomi/extension/en/shootingstarscans/ShootingStarScans.kt
new file mode 100644
index 000000000..1977925af
--- /dev/null
+++ b/src/en/shootingstarscans/src/eu/kanade/tachiyomi/extension/en/shootingstarscans/ShootingStarScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.shootingstarscans
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class ShootingStarScans : Madara("Shooting Star Scans", "https://shootingstarscans.com", "en")
diff --git a/src/en/shoujohearts/build.gradle b/src/en/shoujohearts/build.gradle
new file mode 100644
index 000000000..7d586579c
--- /dev/null
+++ b/src/en/shoujohearts/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ShoujoHearts'
+ extClass = '.ShoujoHearts'
+ themePkg = 'madara'
+ baseUrl = 'https://shoujohearts.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/shoujohearts/res/mipmap-hdpi/ic_launcher.png b/src/en/shoujohearts/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shoujohearts/res/mipmap-hdpi/ic_launcher.png
rename to src/en/shoujohearts/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shoujohearts/res/mipmap-mdpi/ic_launcher.png b/src/en/shoujohearts/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shoujohearts/res/mipmap-mdpi/ic_launcher.png
rename to src/en/shoujohearts/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shoujohearts/res/mipmap-xhdpi/ic_launcher.png b/src/en/shoujohearts/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shoujohearts/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/shoujohearts/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shoujohearts/res/mipmap-xxhdpi/ic_launcher.png b/src/en/shoujohearts/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shoujohearts/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/shoujohearts/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shoujohearts/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/shoujohearts/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shoujohearts/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/shoujohearts/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shoujohearts/src/ShoujoHearts.kt b/src/en/shoujohearts/src/eu/kanade/tachiyomi/extension/en/shoujohearts/ShoujoHearts.kt
similarity index 100%
rename from multisrc/overrides/madara/shoujohearts/src/ShoujoHearts.kt
rename to src/en/shoujohearts/src/eu/kanade/tachiyomi/extension/en/shoujohearts/ShoujoHearts.kt
diff --git a/src/en/silentsky/build.gradle b/src/en/silentsky/build.gradle
new file mode 100644
index 000000000..3c5590980
--- /dev/null
+++ b/src/en/silentsky/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Silent Sky'
+ extClass = '.SilentSky'
+ themePkg = 'foolslide'
+ baseUrl = 'https://reader.silentsky-scans.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/foolslide/silentsky/res/mipmap-hdpi/ic_launcher.png b/src/en/silentsky/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/silentsky/res/mipmap-hdpi/ic_launcher.png
rename to src/en/silentsky/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/silentsky/res/mipmap-mdpi/ic_launcher.png b/src/en/silentsky/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/silentsky/res/mipmap-mdpi/ic_launcher.png
rename to src/en/silentsky/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/silentsky/res/mipmap-xhdpi/ic_launcher.png b/src/en/silentsky/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/silentsky/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/silentsky/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/silentsky/res/mipmap-xxhdpi/ic_launcher.png b/src/en/silentsky/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/silentsky/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/silentsky/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/silentsky/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/silentsky/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/silentsky/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/silentsky/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/silentsky/src/eu/kanade/tachiyomi/extension/en/silentsky/SilentSky.kt b/src/en/silentsky/src/eu/kanade/tachiyomi/extension/en/silentsky/SilentSky.kt
new file mode 100644
index 000000000..a5262759f
--- /dev/null
+++ b/src/en/silentsky/src/eu/kanade/tachiyomi/extension/en/silentsky/SilentSky.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.silentsky
+
+import eu.kanade.tachiyomi.multisrc.foolslide.FoolSlide
+
+class SilentSky : FoolSlide("Silent Sky", "https://reader.silentsky-scans.net", "en")
diff --git a/src/en/skymangaxyz/build.gradle b/src/en/skymangaxyz/build.gradle
new file mode 100644
index 000000000..aca4ab6b6
--- /dev/null
+++ b/src/en/skymangaxyz/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'SkyManga.xyz'
+ extClass = '.SkyMangaXyz'
+ themePkg = 'madara'
+ baseUrl = 'https://skymanga.xyz'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/skymangaxyz/res/mipmap-hdpi/ic_launcher.png b/src/en/skymangaxyz/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/skymangaxyz/res/mipmap-hdpi/ic_launcher.png
rename to src/en/skymangaxyz/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/skymangaxyz/res/mipmap-mdpi/ic_launcher.png b/src/en/skymangaxyz/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/skymangaxyz/res/mipmap-mdpi/ic_launcher.png
rename to src/en/skymangaxyz/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/skymangaxyz/res/mipmap-xhdpi/ic_launcher.png b/src/en/skymangaxyz/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/skymangaxyz/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/skymangaxyz/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/skymangaxyz/res/mipmap-xxhdpi/ic_launcher.png b/src/en/skymangaxyz/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/skymangaxyz/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/skymangaxyz/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/skymangaxyz/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/skymangaxyz/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/skymangaxyz/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/skymangaxyz/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/skymangaxyz/src/SkyMangaXyz.kt b/src/en/skymangaxyz/src/eu/kanade/tachiyomi/extension/en/skymangaxyz/SkyMangaXyz.kt
similarity index 100%
rename from multisrc/overrides/madara/skymangaxyz/src/SkyMangaXyz.kt
rename to src/en/skymangaxyz/src/eu/kanade/tachiyomi/extension/en/skymangaxyz/SkyMangaXyz.kt
diff --git a/src/en/sleepytranslations/build.gradle b/src/en/sleepytranslations/build.gradle
new file mode 100644
index 000000000..5047d9a44
--- /dev/null
+++ b/src/en/sleepytranslations/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sleepy Translations'
+ extClass = '.SleepyTranslations'
+ themePkg = 'madara'
+ baseUrl = 'https://sleepytranslations.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/sleepytranslations/res/mipmap-hdpi/ic_launcher.png b/src/en/sleepytranslations/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sleepytranslations/res/mipmap-hdpi/ic_launcher.png
rename to src/en/sleepytranslations/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sleepytranslations/res/mipmap-mdpi/ic_launcher.png b/src/en/sleepytranslations/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sleepytranslations/res/mipmap-mdpi/ic_launcher.png
rename to src/en/sleepytranslations/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sleepytranslations/res/mipmap-xhdpi/ic_launcher.png b/src/en/sleepytranslations/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sleepytranslations/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/sleepytranslations/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sleepytranslations/res/mipmap-xxhdpi/ic_launcher.png b/src/en/sleepytranslations/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sleepytranslations/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/sleepytranslations/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sleepytranslations/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/sleepytranslations/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sleepytranslations/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/sleepytranslations/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/sleepytranslations/src/eu/kanade/tachiyomi/extension/en/sleepytranslations/SleepyTranslations.kt b/src/en/sleepytranslations/src/eu/kanade/tachiyomi/extension/en/sleepytranslations/SleepyTranslations.kt
new file mode 100644
index 000000000..ebb2b9c50
--- /dev/null
+++ b/src/en/sleepytranslations/src/eu/kanade/tachiyomi/extension/en/sleepytranslations/SleepyTranslations.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.sleepytranslations
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class SleepyTranslations : Madara("Sleepy Translations", "https://sleepytranslations.com", "en")
diff --git a/src/en/sololeveling/build.gradle b/src/en/sololeveling/build.gradle
new file mode 100644
index 000000000..cfea72b26
--- /dev/null
+++ b/src/en/sololeveling/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Solo Leveling'
+ extClass = '.SoloLeveling'
+ themePkg = 'madara'
+ baseUrl = 'https://readsololeveling.online'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/sololeveling/res/mipmap-hdpi/ic_launcher.png b/src/en/sololeveling/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sololeveling/res/mipmap-hdpi/ic_launcher.png
rename to src/en/sololeveling/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sololeveling/res/mipmap-mdpi/ic_launcher.png b/src/en/sololeveling/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sololeveling/res/mipmap-mdpi/ic_launcher.png
rename to src/en/sololeveling/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sololeveling/res/mipmap-xhdpi/ic_launcher.png b/src/en/sololeveling/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sololeveling/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/sololeveling/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sololeveling/res/mipmap-xxhdpi/ic_launcher.png b/src/en/sololeveling/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sololeveling/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/sololeveling/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sololeveling/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/sololeveling/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sololeveling/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/sololeveling/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/sololeveling/src/eu/kanade/tachiyomi/extension/en/sololeveling/SoloLeveling.kt b/src/en/sololeveling/src/eu/kanade/tachiyomi/extension/en/sololeveling/SoloLeveling.kt
new file mode 100644
index 000000000..715dbce9b
--- /dev/null
+++ b/src/en/sololeveling/src/eu/kanade/tachiyomi/extension/en/sololeveling/SoloLeveling.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.sololeveling
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class SoloLeveling : Madara("Solo Leveling", "https://readsololeveling.online", "en")
diff --git a/src/en/stonescape/build.gradle b/src/en/stonescape/build.gradle
new file mode 100644
index 000000000..e170527a8
--- /dev/null
+++ b/src/en/stonescape/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'StoneScape'
+ extClass = '.StoneScape'
+ themePkg = 'madara'
+ baseUrl = 'https://stonescape.xyz'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/stonescape/res/mipmap-hdpi/ic_launcher.png b/src/en/stonescape/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/stonescape/res/mipmap-hdpi/ic_launcher.png
rename to src/en/stonescape/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/stonescape/res/mipmap-mdpi/ic_launcher.png b/src/en/stonescape/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/stonescape/res/mipmap-mdpi/ic_launcher.png
rename to src/en/stonescape/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/stonescape/res/mipmap-xhdpi/ic_launcher.png b/src/en/stonescape/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/stonescape/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/stonescape/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/stonescape/res/mipmap-xxhdpi/ic_launcher.png b/src/en/stonescape/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/stonescape/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/stonescape/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/stonescape/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/stonescape/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/stonescape/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/stonescape/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/stonescape/src/StoneScape.kt b/src/en/stonescape/src/eu/kanade/tachiyomi/extension/en/stonescape/StoneScape.kt
similarity index 100%
rename from multisrc/overrides/madara/stonescape/src/StoneScape.kt
rename to src/en/stonescape/src/eu/kanade/tachiyomi/extension/en/stonescape/StoneScape.kt
diff --git a/src/en/sugarbabies/build.gradle b/src/en/sugarbabies/build.gradle
new file mode 100644
index 000000000..3498ab7df
--- /dev/null
+++ b/src/en/sugarbabies/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sugar Babies'
+ extClass = '.SugarBabies'
+ themePkg = 'madara'
+ baseUrl = 'https://sugarbbscan.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/sugarbabies/res/mipmap-hdpi/ic_launcher.png b/src/en/sugarbabies/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sugarbabies/res/mipmap-hdpi/ic_launcher.png
rename to src/en/sugarbabies/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sugarbabies/res/mipmap-mdpi/ic_launcher.png b/src/en/sugarbabies/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sugarbabies/res/mipmap-mdpi/ic_launcher.png
rename to src/en/sugarbabies/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sugarbabies/res/mipmap-xhdpi/ic_launcher.png b/src/en/sugarbabies/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sugarbabies/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/sugarbabies/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sugarbabies/res/mipmap-xxhdpi/ic_launcher.png b/src/en/sugarbabies/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sugarbabies/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/sugarbabies/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sugarbabies/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/sugarbabies/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sugarbabies/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/sugarbabies/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/sugarbabies/src/eu/kanade/tachiyomi/extension/en/sugarbabies/SugarBabies.kt b/src/en/sugarbabies/src/eu/kanade/tachiyomi/extension/en/sugarbabies/SugarBabies.kt
new file mode 100644
index 000000000..01659e3f0
--- /dev/null
+++ b/src/en/sugarbabies/src/eu/kanade/tachiyomi/extension/en/sugarbabies/SugarBabies.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.sugarbabies
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class SugarBabies : Madara("Sugar Babies", "https://sugarbbscan.com", "en")
diff --git a/src/en/summanga/build.gradle b/src/en/summanga/build.gradle
new file mode 100644
index 000000000..ec9f63868
--- /dev/null
+++ b/src/en/summanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Summanga'
+ extClass = '.Summanga'
+ themePkg = 'madara'
+ baseUrl = 'https://summanga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/summanga/res/mipmap-hdpi/ic_launcher.png b/src/en/summanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/summanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/summanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/summanga/res/mipmap-mdpi/ic_launcher.png b/src/en/summanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/summanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/summanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/summanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/summanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/summanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/summanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/summanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/summanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/summanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/summanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/summanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/summanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/summanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/summanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/summanga/src/eu/kanade/tachiyomi/extension/en/summanga/Summanga.kt b/src/en/summanga/src/eu/kanade/tachiyomi/extension/en/summanga/Summanga.kt
new file mode 100644
index 000000000..c83ab2076
--- /dev/null
+++ b/src/en/summanga/src/eu/kanade/tachiyomi/extension/en/summanga/Summanga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.summanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Summanga : Madara("Summanga", "https://summanga.com", "en")
diff --git a/src/en/sunshinebutterflyscans/build.gradle b/src/en/sunshinebutterflyscans/build.gradle
new file mode 100644
index 000000000..2504d64d8
--- /dev/null
+++ b/src/en/sunshinebutterflyscans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Sunshine Butterfly Scans'
+ extClass = '.SunshineButterflyScans'
+ themePkg = 'madara'
+ baseUrl = 'https://sunshinebutterflyscan.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/sunshinebutterflyscans/res/mipmap-hdpi/ic_launcher.png b/src/en/sunshinebutterflyscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sunshinebutterflyscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/sunshinebutterflyscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sunshinebutterflyscans/res/mipmap-mdpi/ic_launcher.png b/src/en/sunshinebutterflyscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sunshinebutterflyscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/sunshinebutterflyscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sunshinebutterflyscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/sunshinebutterflyscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sunshinebutterflyscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/sunshinebutterflyscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sunshinebutterflyscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/sunshinebutterflyscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sunshinebutterflyscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/sunshinebutterflyscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sunshinebutterflyscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/sunshinebutterflyscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sunshinebutterflyscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/sunshinebutterflyscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/sunshinebutterflyscans/src/eu/kanade/tachiyomi/extension/en/sunshinebutterflyscans/SunshineButterflyScans.kt b/src/en/sunshinebutterflyscans/src/eu/kanade/tachiyomi/extension/en/sunshinebutterflyscans/SunshineButterflyScans.kt
new file mode 100644
index 000000000..0cb42b19d
--- /dev/null
+++ b/src/en/sunshinebutterflyscans/src/eu/kanade/tachiyomi/extension/en/sunshinebutterflyscans/SunshineButterflyScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.sunshinebutterflyscans
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class SunshineButterflyScans : Madara("Sunshine Butterfly Scans", "https://sunshinebutterflyscan.com", "en")
diff --git a/src/en/suryascans/build.gradle b/src/en/suryascans/build.gradle
new file mode 100644
index 000000000..638837756
--- /dev/null
+++ b/src/en/suryascans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Surya Scans'
+ extClass = '.SuryaScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://suryatoon.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/suryascans/res/mipmap-hdpi/ic_launcher.png b/src/en/suryascans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/suryascans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/suryascans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/suryascans/res/mipmap-mdpi/ic_launcher.png b/src/en/suryascans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/suryascans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/suryascans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/suryascans/res/mipmap-xhdpi/ic_launcher.png b/src/en/suryascans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/suryascans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/suryascans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/suryascans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/suryascans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/suryascans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/suryascans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/suryascans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/suryascans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/suryascans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/suryascans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/suryascans/src/eu/kanade/tachiyomi/extension/en/suryascans/SuryaScans.kt b/src/en/suryascans/src/eu/kanade/tachiyomi/extension/en/suryascans/SuryaScans.kt
new file mode 100644
index 000000000..d1f783000
--- /dev/null
+++ b/src/en/suryascans/src/eu/kanade/tachiyomi/extension/en/suryascans/SuryaScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.suryascans
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class SuryaScans : MangaThemesia("Surya Scans", "https://suryatoon.com", "en")
diff --git a/src/en/tappytoonnet/build.gradle b/src/en/tappytoonnet/build.gradle
new file mode 100644
index 000000000..93fa36c22
--- /dev/null
+++ b/src/en/tappytoonnet/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'TappyToon.Net'
+ extClass = '.Tappytoonnet'
+ themePkg = 'madara'
+ baseUrl = 'https://tappytoon.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/tappytoonnet/res/mipmap-hdpi/ic_launcher.png b/src/en/tappytoonnet/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tappytoonnet/res/mipmap-hdpi/ic_launcher.png
rename to src/en/tappytoonnet/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tappytoonnet/res/mipmap-mdpi/ic_launcher.png b/src/en/tappytoonnet/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tappytoonnet/res/mipmap-mdpi/ic_launcher.png
rename to src/en/tappytoonnet/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tappytoonnet/res/mipmap-xhdpi/ic_launcher.png b/src/en/tappytoonnet/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tappytoonnet/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/tappytoonnet/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tappytoonnet/res/mipmap-xxhdpi/ic_launcher.png b/src/en/tappytoonnet/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tappytoonnet/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/tappytoonnet/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tappytoonnet/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/tappytoonnet/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tappytoonnet/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/tappytoonnet/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tappytoonnet/src/Tappytoonnet.kt b/src/en/tappytoonnet/src/eu/kanade/tachiyomi/extension/en/tappytoonnet/Tappytoonnet.kt
similarity index 100%
rename from multisrc/overrides/madara/tappytoonnet/src/Tappytoonnet.kt
rename to src/en/tappytoonnet/src/eu/kanade/tachiyomi/extension/en/tappytoonnet/Tappytoonnet.kt
diff --git a/src/en/teenmanhua/build.gradle b/src/en/teenmanhua/build.gradle
new file mode 100644
index 000000000..47414455b
--- /dev/null
+++ b/src/en/teenmanhua/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'TeenManhua'
+ extClass = '.TeenManhua'
+ themePkg = 'madara'
+ baseUrl = 'https://teenmanhua.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/teenmanhua/res/mipmap-hdpi/ic_launcher.png b/src/en/teenmanhua/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/teenmanhua/res/mipmap-hdpi/ic_launcher.png
rename to src/en/teenmanhua/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/teenmanhua/res/mipmap-mdpi/ic_launcher.png b/src/en/teenmanhua/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/teenmanhua/res/mipmap-mdpi/ic_launcher.png
rename to src/en/teenmanhua/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/teenmanhua/res/mipmap-xhdpi/ic_launcher.png b/src/en/teenmanhua/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/teenmanhua/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/teenmanhua/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/teenmanhua/res/mipmap-xxhdpi/ic_launcher.png b/src/en/teenmanhua/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/teenmanhua/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/teenmanhua/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/teenmanhua/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/teenmanhua/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/teenmanhua/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/teenmanhua/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/teenmanhua/src/TeenManhua.kt b/src/en/teenmanhua/src/eu/kanade/tachiyomi/extension/en/teenmanhua/TeenManhua.kt
similarity index 100%
rename from multisrc/overrides/madara/teenmanhua/src/TeenManhua.kt
rename to src/en/teenmanhua/src/eu/kanade/tachiyomi/extension/en/teenmanhua/TeenManhua.kt
diff --git a/src/en/templescan/build.gradle b/src/en/templescan/build.gradle
new file mode 100644
index 000000000..fb2e1ee15
--- /dev/null
+++ b/src/en/templescan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Temple Scan'
+ extClass = '.TempleScan'
+ themePkg = 'heancms'
+ baseUrl = 'https://templescan.net'
+ overrideVersionCode = 16
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/heancms/templescan/res/mipmap-hdpi/ic_launcher.png b/src/en/templescan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/templescan/res/mipmap-hdpi/ic_launcher.png
rename to src/en/templescan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/templescan/res/mipmap-mdpi/ic_launcher.png b/src/en/templescan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/templescan/res/mipmap-mdpi/ic_launcher.png
rename to src/en/templescan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/templescan/res/mipmap-xhdpi/ic_launcher.png b/src/en/templescan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/templescan/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/templescan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/templescan/res/mipmap-xxhdpi/ic_launcher.png b/src/en/templescan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/templescan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/templescan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/templescan/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/templescan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/templescan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/templescan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/templescan/src/TempleScan.kt b/src/en/templescan/src/eu/kanade/tachiyomi/extension/en/templescan/TempleScan.kt
similarity index 100%
rename from multisrc/overrides/heancms/templescan/src/TempleScan.kt
rename to src/en/templescan/src/eu/kanade/tachiyomi/extension/en/templescan/TempleScan.kt
diff --git a/src/en/theapolloteam/build.gradle b/src/en/theapolloteam/build.gradle
new file mode 100644
index 000000000..f1dffe1e7
--- /dev/null
+++ b/src/en/theapolloteam/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'The Apollo Team'
+ extClass = '.TheApolloTeam'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://theapollo.team'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/theapolloteam/res/mipmap-hdpi/ic_launcher.png b/src/en/theapolloteam/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/theapolloteam/res/mipmap-hdpi/ic_launcher.png
rename to src/en/theapolloteam/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/theapolloteam/res/mipmap-mdpi/ic_launcher.png b/src/en/theapolloteam/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/theapolloteam/res/mipmap-mdpi/ic_launcher.png
rename to src/en/theapolloteam/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/theapolloteam/res/mipmap-xhdpi/ic_launcher.png b/src/en/theapolloteam/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/theapolloteam/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/theapolloteam/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/theapolloteam/res/mipmap-xxhdpi/ic_launcher.png b/src/en/theapolloteam/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/theapolloteam/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/theapolloteam/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/theapolloteam/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/theapolloteam/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/theapolloteam/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/theapolloteam/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/theapolloteam/src/eu/kanade/tachiyomi/extension/en/theapolloteam/TheApolloTeam.kt b/src/en/theapolloteam/src/eu/kanade/tachiyomi/extension/en/theapolloteam/TheApolloTeam.kt
new file mode 100644
index 000000000..43640ad76
--- /dev/null
+++ b/src/en/theapolloteam/src/eu/kanade/tachiyomi/extension/en/theapolloteam/TheApolloTeam.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.theapolloteam
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class TheApolloTeam : MangaThemesia("The Apollo Team", "https://theapollo.team", "en")
diff --git a/src/en/theblank/build.gradle b/src/en/theblank/build.gradle
new file mode 100644
index 000000000..d5544140f
--- /dev/null
+++ b/src/en/theblank/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'The Blank Scanlation'
+ extClass = '.TheBlank'
+ themePkg = 'madara'
+ baseUrl = 'https://theblank.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/theblank/res/mipmap-hdpi/ic_launcher.png b/src/en/theblank/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/theblank/res/mipmap-hdpi/ic_launcher.png
rename to src/en/theblank/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/theblank/res/mipmap-mdpi/ic_launcher.png b/src/en/theblank/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/theblank/res/mipmap-mdpi/ic_launcher.png
rename to src/en/theblank/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/theblank/res/mipmap-xhdpi/ic_launcher.png b/src/en/theblank/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/theblank/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/theblank/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/theblank/res/mipmap-xxhdpi/ic_launcher.png b/src/en/theblank/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/theblank/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/theblank/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/theblank/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/theblank/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/theblank/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/theblank/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/theblank/src/TheBlank.kt b/src/en/theblank/src/eu/kanade/tachiyomi/extension/en/theblank/TheBlank.kt
similarity index 100%
rename from multisrc/overrides/madara/theblank/src/TheBlank.kt
rename to src/en/theblank/src/eu/kanade/tachiyomi/extension/en/theblank/TheBlank.kt
diff --git a/src/en/theguild/build.gradle b/src/en/theguild/build.gradle
new file mode 100644
index 000000000..7ed6cabba
--- /dev/null
+++ b/src/en/theguild/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'The Guild'
+ extClass = '.TheGuild'
+ themePkg = 'madara'
+ baseUrl = 'https://theguildscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/theguild/res/mipmap-hdpi/ic_launcher.png b/src/en/theguild/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/theguild/res/mipmap-hdpi/ic_launcher.png
rename to src/en/theguild/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/theguild/res/mipmap-mdpi/ic_launcher.png b/src/en/theguild/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/theguild/res/mipmap-mdpi/ic_launcher.png
rename to src/en/theguild/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/theguild/res/mipmap-xhdpi/ic_launcher.png b/src/en/theguild/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/theguild/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/theguild/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/theguild/res/mipmap-xxhdpi/ic_launcher.png b/src/en/theguild/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/theguild/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/theguild/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/theguild/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/theguild/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/theguild/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/theguild/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/theguild/src/eu/kanade/tachiyomi/extension/en/theguild/TheGuild.kt b/src/en/theguild/src/eu/kanade/tachiyomi/extension/en/theguild/TheGuild.kt
new file mode 100644
index 000000000..9e782571f
--- /dev/null
+++ b/src/en/theguild/src/eu/kanade/tachiyomi/extension/en/theguild/TheGuild.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.theguild
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class TheGuild : Madara("The Guild", "https://theguildscans.com", "en")
diff --git a/src/en/todaymic/build.gradle b/src/en/todaymic/build.gradle
new file mode 100644
index 000000000..72fd3ba87
--- /dev/null
+++ b/src/en/todaymic/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Todaymic'
+ extClass = '.Todaymic'
+ themePkg = 'madara'
+ baseUrl = 'https://todaymic.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/todaymic/res/mipmap-hdpi/ic_launcher.png b/src/en/todaymic/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/todaymic/res/mipmap-hdpi/ic_launcher.png
rename to src/en/todaymic/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/todaymic/res/mipmap-mdpi/ic_launcher.png b/src/en/todaymic/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/todaymic/res/mipmap-mdpi/ic_launcher.png
rename to src/en/todaymic/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/todaymic/res/mipmap-xhdpi/ic_launcher.png b/src/en/todaymic/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/todaymic/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/todaymic/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/todaymic/res/mipmap-xxhdpi/ic_launcher.png b/src/en/todaymic/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/todaymic/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/todaymic/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/todaymic/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/todaymic/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/todaymic/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/todaymic/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/todaymic/src/eu/kanade/tachiyomi/extension/en/todaymic/Todaymic.kt b/src/en/todaymic/src/eu/kanade/tachiyomi/extension/en/todaymic/Todaymic.kt
new file mode 100644
index 000000000..6501292cb
--- /dev/null
+++ b/src/en/todaymic/src/eu/kanade/tachiyomi/extension/en/todaymic/Todaymic.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.todaymic
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Todaymic : Madara("Todaymic", "https://todaymic.com", "en")
diff --git a/src/en/toonchill/build.gradle b/src/en/toonchill/build.gradle
new file mode 100644
index 000000000..146ad2861
--- /dev/null
+++ b/src/en/toonchill/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ToonChill'
+ extClass = '.ToonChill'
+ themePkg = 'madara'
+ baseUrl = 'https://toonchill.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/toonchill/res/mipmap-hdpi/ic_launcher.png b/src/en/toonchill/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonchill/res/mipmap-hdpi/ic_launcher.png
rename to src/en/toonchill/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonchill/res/mipmap-mdpi/ic_launcher.png b/src/en/toonchill/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonchill/res/mipmap-mdpi/ic_launcher.png
rename to src/en/toonchill/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonchill/res/mipmap-xhdpi/ic_launcher.png b/src/en/toonchill/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonchill/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/toonchill/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonchill/res/mipmap-xxhdpi/ic_launcher.png b/src/en/toonchill/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonchill/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/toonchill/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonchill/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/toonchill/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonchill/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/toonchill/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/toonchill/src/eu/kanade/tachiyomi/extension/en/toonchill/ToonChill.kt b/src/en/toonchill/src/eu/kanade/tachiyomi/extension/en/toonchill/ToonChill.kt
new file mode 100644
index 000000000..b87fb041e
--- /dev/null
+++ b/src/en/toonchill/src/eu/kanade/tachiyomi/extension/en/toonchill/ToonChill.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.toonchill
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class ToonChill : Madara("ToonChill", "https://toonchill.com", "en")
diff --git a/src/en/toongod/build.gradle b/src/en/toongod/build.gradle
new file mode 100644
index 000000000..f05b00684
--- /dev/null
+++ b/src/en/toongod/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ToonGod'
+ extClass = '.ToonGod'
+ themePkg = 'madara'
+ baseUrl = 'https://www.toongod.org'
+ overrideVersionCode = 5
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/toongod/res/mipmap-hdpi/ic_launcher.png b/src/en/toongod/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toongod/res/mipmap-hdpi/ic_launcher.png
rename to src/en/toongod/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toongod/res/mipmap-mdpi/ic_launcher.png b/src/en/toongod/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toongod/res/mipmap-mdpi/ic_launcher.png
rename to src/en/toongod/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toongod/res/mipmap-xhdpi/ic_launcher.png b/src/en/toongod/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toongod/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/toongod/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toongod/res/mipmap-xxhdpi/ic_launcher.png b/src/en/toongod/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toongod/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/toongod/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toongod/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/toongod/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toongod/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/toongod/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toongod/src/ToonGod.kt b/src/en/toongod/src/eu/kanade/tachiyomi/extension/en/toongod/ToonGod.kt
similarity index 100%
rename from multisrc/overrides/madara/toongod/src/ToonGod.kt
rename to src/en/toongod/src/eu/kanade/tachiyomi/extension/en/toongod/ToonGod.kt
diff --git a/src/en/toonily/build.gradle b/src/en/toonily/build.gradle
new file mode 100644
index 000000000..29b0ddb15
--- /dev/null
+++ b/src/en/toonily/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Toonily'
+ extClass = '.Toonily'
+ themePkg = 'madara'
+ baseUrl = 'https://toonily.com'
+ overrideVersionCode = 11
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/toonily/res/mipmap-hdpi/ic_launcher.png b/src/en/toonily/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonily/res/mipmap-hdpi/ic_launcher.png
rename to src/en/toonily/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonily/res/mipmap-mdpi/ic_launcher.png b/src/en/toonily/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonily/res/mipmap-mdpi/ic_launcher.png
rename to src/en/toonily/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonily/res/mipmap-xhdpi/ic_launcher.png b/src/en/toonily/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonily/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/toonily/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonily/res/mipmap-xxhdpi/ic_launcher.png b/src/en/toonily/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonily/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/toonily/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonily/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/toonily/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonily/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/toonily/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonily/src/CookieInterceptor.kt b/src/en/toonily/src/eu/kanade/tachiyomi/extension/en/toonily/CookieInterceptor.kt
similarity index 100%
rename from multisrc/overrides/madara/toonily/src/CookieInterceptor.kt
rename to src/en/toonily/src/eu/kanade/tachiyomi/extension/en/toonily/CookieInterceptor.kt
diff --git a/multisrc/overrides/madara/toonily/src/Toonily.kt b/src/en/toonily/src/eu/kanade/tachiyomi/extension/en/toonily/Toonily.kt
similarity index 100%
rename from multisrc/overrides/madara/toonily/src/Toonily.kt
rename to src/en/toonily/src/eu/kanade/tachiyomi/extension/en/toonily/Toonily.kt
diff --git a/src/en/toonilyme/build.gradle b/src/en/toonilyme/build.gradle
new file mode 100644
index 000000000..ffeb459cf
--- /dev/null
+++ b/src/en/toonilyme/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Toonily.me'
+ extClass = '.ToonilyMe'
+ themePkg = 'madtheme'
+ baseUrl = 'https://toonily.me'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madtheme/toonilyme/res/mipmap-hdpi/ic_launcher.png b/src/en/toonilyme/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/toonilyme/res/mipmap-hdpi/ic_launcher.png
rename to src/en/toonilyme/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/toonilyme/res/mipmap-mdpi/ic_launcher.png b/src/en/toonilyme/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/toonilyme/res/mipmap-mdpi/ic_launcher.png
rename to src/en/toonilyme/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/toonilyme/res/mipmap-xhdpi/ic_launcher.png b/src/en/toonilyme/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/toonilyme/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/toonilyme/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/toonilyme/res/mipmap-xxhdpi/ic_launcher.png b/src/en/toonilyme/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/toonilyme/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/toonilyme/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/toonilyme/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/toonilyme/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/toonilyme/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/toonilyme/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/toonilyme/src/eu/kanade/tachiyomi/extension/en/toonilyme/ToonilyMe.kt b/src/en/toonilyme/src/eu/kanade/tachiyomi/extension/en/toonilyme/ToonilyMe.kt
new file mode 100644
index 000000000..88926c2d8
--- /dev/null
+++ b/src/en/toonilyme/src/eu/kanade/tachiyomi/extension/en/toonilyme/ToonilyMe.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.toonilyme
+
+import eu.kanade.tachiyomi.multisrc.madtheme.MadTheme
+
+class ToonilyMe : MadTheme("Toonily.me", "https://toonily.me", "en")
diff --git a/src/en/toonitube/build.gradle b/src/en/toonitube/build.gradle
new file mode 100644
index 000000000..5145b735e
--- /dev/null
+++ b/src/en/toonitube/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'TooniTube'
+ extClass = '.TooniTube'
+ themePkg = 'madtheme'
+ baseUrl = 'https://toonitube.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madtheme/toonitube/res/mipmap-hdpi/ic_launcher.png b/src/en/toonitube/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/toonitube/res/mipmap-hdpi/ic_launcher.png
rename to src/en/toonitube/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/toonitube/res/mipmap-mdpi/ic_launcher.png b/src/en/toonitube/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/toonitube/res/mipmap-mdpi/ic_launcher.png
rename to src/en/toonitube/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/toonitube/res/mipmap-xhdpi/ic_launcher.png b/src/en/toonitube/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/toonitube/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/toonitube/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/toonitube/res/mipmap-xxhdpi/ic_launcher.png b/src/en/toonitube/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/toonitube/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/toonitube/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/toonitube/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/toonitube/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/toonitube/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/toonitube/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/toonitube/src/eu/kanade/tachiyomi/extension/en/toonitube/TooniTube.kt b/src/en/toonitube/src/eu/kanade/tachiyomi/extension/en/toonitube/TooniTube.kt
new file mode 100644
index 000000000..5ad0ea56b
--- /dev/null
+++ b/src/en/toonitube/src/eu/kanade/tachiyomi/extension/en/toonitube/TooniTube.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.toonitube
+
+import eu.kanade.tachiyomi.multisrc.madtheme.MadTheme
+
+class TooniTube : MadTheme("TooniTube", "https://toonitube.com", "en")
diff --git a/src/en/toonizy/build.gradle b/src/en/toonizy/build.gradle
new file mode 100644
index 000000000..647c45ccd
--- /dev/null
+++ b/src/en/toonizy/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Toonizy'
+ extClass = '.Toonizy'
+ themePkg = 'madara'
+ baseUrl = 'https://toonizy.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/toonizy/res/mipmap-hdpi/ic_launcher.png b/src/en/toonizy/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonizy/res/mipmap-hdpi/ic_launcher.png
rename to src/en/toonizy/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonizy/res/mipmap-mdpi/ic_launcher.png b/src/en/toonizy/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonizy/res/mipmap-mdpi/ic_launcher.png
rename to src/en/toonizy/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonizy/res/mipmap-xhdpi/ic_launcher.png b/src/en/toonizy/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonizy/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/toonizy/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonizy/res/mipmap-xxhdpi/ic_launcher.png b/src/en/toonizy/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonizy/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/toonizy/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonizy/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/toonizy/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonizy/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/toonizy/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonizy/src/Toonizy.kt b/src/en/toonizy/src/eu/kanade/tachiyomi/extension/en/toonizy/Toonizy.kt
similarity index 100%
rename from multisrc/overrides/madara/toonizy/src/Toonizy.kt
rename to src/en/toonizy/src/eu/kanade/tachiyomi/extension/en/toonizy/Toonizy.kt
diff --git a/src/en/toonmany/build.gradle b/src/en/toonmany/build.gradle
new file mode 100644
index 000000000..36388b927
--- /dev/null
+++ b/src/en/toonmany/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ToonMany'
+ extClass = '.ToonMany'
+ themePkg = 'madara'
+ baseUrl = 'https://toonmany.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/toonmany/res/mipmap-hdpi/ic_launcher.png b/src/en/toonmany/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonmany/res/mipmap-hdpi/ic_launcher.png
rename to src/en/toonmany/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonmany/res/mipmap-mdpi/ic_launcher.png b/src/en/toonmany/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonmany/res/mipmap-mdpi/ic_launcher.png
rename to src/en/toonmany/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonmany/res/mipmap-xhdpi/ic_launcher.png b/src/en/toonmany/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonmany/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/toonmany/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonmany/res/mipmap-xxhdpi/ic_launcher.png b/src/en/toonmany/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonmany/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/toonmany/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonmany/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/toonmany/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/toonmany/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/toonmany/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/toonmany/src/ToonMany.kt b/src/en/toonmany/src/eu/kanade/tachiyomi/extension/en/toonmany/ToonMany.kt
similarity index 100%
rename from multisrc/overrides/madara/toonmany/src/ToonMany.kt
rename to src/en/toonmany/src/eu/kanade/tachiyomi/extension/en/toonmany/ToonMany.kt
diff --git a/src/en/topmanhua/build.gradle b/src/en/topmanhua/build.gradle
new file mode 100644
index 000000000..a8cb61af0
--- /dev/null
+++ b/src/en/topmanhua/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Top Manhua'
+ extClass = '.TopManhua'
+ themePkg = 'madara'
+ baseUrl = 'https://topmanhua.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/topmanhua/res/mipmap-hdpi/ic_launcher.png b/src/en/topmanhua/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/topmanhua/res/mipmap-hdpi/ic_launcher.png
rename to src/en/topmanhua/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/topmanhua/res/mipmap-mdpi/ic_launcher.png b/src/en/topmanhua/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/topmanhua/res/mipmap-mdpi/ic_launcher.png
rename to src/en/topmanhua/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/topmanhua/res/mipmap-xhdpi/ic_launcher.png b/src/en/topmanhua/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/topmanhua/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/topmanhua/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/topmanhua/res/mipmap-xxhdpi/ic_launcher.png b/src/en/topmanhua/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/topmanhua/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/topmanhua/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/topmanhua/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/topmanhua/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/topmanhua/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/topmanhua/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/topmanhua/src/TopManhua.kt b/src/en/topmanhua/src/eu/kanade/tachiyomi/extension/en/topmanhua/TopManhua.kt
similarity index 100%
rename from multisrc/overrides/madara/topmanhua/src/TopManhua.kt
rename to src/en/topmanhua/src/eu/kanade/tachiyomi/extension/en/topmanhua/TopManhua.kt
diff --git a/src/en/topreadmanhwa/build.gradle b/src/en/topreadmanhwa/build.gradle
new file mode 100644
index 000000000..25b415dcc
--- /dev/null
+++ b/src/en/topreadmanhwa/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'TopReadManhwa'
+ extClass = '.TopReadManhwa'
+ themePkg = 'madara'
+ baseUrl = 'https://topreadmanhwa.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/topreadmanhwa/res/mipmap-hdpi/ic_launcher.png b/src/en/topreadmanhwa/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/topreadmanhwa/res/mipmap-hdpi/ic_launcher.png
rename to src/en/topreadmanhwa/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/topreadmanhwa/res/mipmap-mdpi/ic_launcher.png b/src/en/topreadmanhwa/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/topreadmanhwa/res/mipmap-mdpi/ic_launcher.png
rename to src/en/topreadmanhwa/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/topreadmanhwa/res/mipmap-xhdpi/ic_launcher.png b/src/en/topreadmanhwa/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/topreadmanhwa/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/topreadmanhwa/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/topreadmanhwa/res/mipmap-xxhdpi/ic_launcher.png b/src/en/topreadmanhwa/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/topreadmanhwa/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/topreadmanhwa/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/topreadmanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/topreadmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/topreadmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/topreadmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/topreadmanhwa/src/TopReadManhwa.kt b/src/en/topreadmanhwa/src/eu/kanade/tachiyomi/extension/en/topreadmanhwa/TopReadManhwa.kt
similarity index 100%
rename from multisrc/overrides/madara/topreadmanhwa/src/TopReadManhwa.kt
rename to src/en/topreadmanhwa/src/eu/kanade/tachiyomi/extension/en/topreadmanhwa/TopReadManhwa.kt
diff --git a/src/en/treemanga/build.gradle b/src/en/treemanga/build.gradle
new file mode 100644
index 000000000..25f7c113f
--- /dev/null
+++ b/src/en/treemanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'TreeManga'
+ extClass = '.TreeManga'
+ themePkg = 'madara'
+ baseUrl = 'https://treemanga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/treemanga/res/mipmap-hdpi/ic_launcher.png b/src/en/treemanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/treemanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/treemanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/treemanga/res/mipmap-mdpi/ic_launcher.png b/src/en/treemanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/treemanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/treemanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/treemanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/treemanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/treemanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/treemanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/treemanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/treemanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/treemanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/treemanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/treemanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/treemanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/treemanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/treemanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/treemanga/src/TreeManga.kt b/src/en/treemanga/src/eu/kanade/tachiyomi/extension/en/treemanga/TreeManga.kt
similarity index 100%
rename from multisrc/overrides/madara/treemanga/src/TreeManga.kt
rename to src/en/treemanga/src/eu/kanade/tachiyomi/extension/en/treemanga/TreeManga.kt
diff --git a/src/en/tritiniascans/build.gradle b/src/en/tritiniascans/build.gradle
new file mode 100644
index 000000000..a642c891b
--- /dev/null
+++ b/src/en/tritiniascans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'TritiniaScans'
+ extClass = '.TritiniaScans'
+ themePkg = 'madara'
+ baseUrl = 'https://tritinia.org'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/tritiniascans/res/mipmap-hdpi/ic_launcher.png b/src/en/tritiniascans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tritiniascans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/tritiniascans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tritiniascans/res/mipmap-mdpi/ic_launcher.png b/src/en/tritiniascans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tritiniascans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/tritiniascans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tritiniascans/res/mipmap-xhdpi/ic_launcher.png b/src/en/tritiniascans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tritiniascans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/tritiniascans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tritiniascans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/tritiniascans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tritiniascans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/tritiniascans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tritiniascans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/tritiniascans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tritiniascans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/tritiniascans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/tritiniascans/src/eu/kanade/tachiyomi/extension/en/tritiniascans/TritiniaScans.kt b/src/en/tritiniascans/src/eu/kanade/tachiyomi/extension/en/tritiniascans/TritiniaScans.kt
new file mode 100644
index 000000000..0d21d8f1a
--- /dev/null
+++ b/src/en/tritiniascans/src/eu/kanade/tachiyomi/extension/en/tritiniascans/TritiniaScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.tritiniascans
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class TritiniaScans : Madara("TritiniaScans", "https://tritinia.org", "en")
diff --git a/src/en/truemanga/build.gradle b/src/en/truemanga/build.gradle
new file mode 100644
index 000000000..54536d141
--- /dev/null
+++ b/src/en/truemanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'TrueManga'
+ extClass = '.TrueManga'
+ themePkg = 'madtheme'
+ baseUrl = 'https://truemanga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madtheme/truemanga/res/mipmap-hdpi/ic_launcher.png b/src/en/truemanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/truemanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/truemanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/truemanga/res/mipmap-mdpi/ic_launcher.png b/src/en/truemanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/truemanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/truemanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/truemanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/truemanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/truemanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/truemanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/truemanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/truemanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/truemanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/truemanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madtheme/truemanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/truemanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madtheme/truemanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/truemanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/truemanga/src/eu/kanade/tachiyomi/extension/en/truemanga/TrueManga.kt b/src/en/truemanga/src/eu/kanade/tachiyomi/extension/en/truemanga/TrueManga.kt
new file mode 100644
index 000000000..d1d838155
--- /dev/null
+++ b/src/en/truemanga/src/eu/kanade/tachiyomi/extension/en/truemanga/TrueManga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.truemanga
+
+import eu.kanade.tachiyomi.multisrc.madtheme.MadTheme
+
+class TrueManga : MadTheme("TrueManga", "https://truemanga.com", "en")
diff --git a/src/en/ultralightscans/build.gradle b/src/en/ultralightscans/build.gradle
new file mode 100644
index 000000000..3b7d16d3d
--- /dev/null
+++ b/src/en/ultralightscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'UltraLight Scans'
+ extClass = '.UltraLightScans'
+ themePkg = 'bakkin'
+ baseUrl = 'https://readlight.org/'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/bakkin/ultralightscans/res/mipmap-hdpi/ic_launcher.png b/src/en/ultralightscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bakkin/ultralightscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/ultralightscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/bakkin/ultralightscans/res/mipmap-mdpi/ic_launcher.png b/src/en/ultralightscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bakkin/ultralightscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/ultralightscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/bakkin/ultralightscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/ultralightscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bakkin/ultralightscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/ultralightscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/bakkin/ultralightscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/ultralightscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bakkin/ultralightscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/ultralightscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/bakkin/ultralightscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/ultralightscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bakkin/ultralightscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/ultralightscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/ultralightscans/src/eu/kanade/tachiyomi/extension/en/ultralightscans/UltraLightScans.kt b/src/en/ultralightscans/src/eu/kanade/tachiyomi/extension/en/ultralightscans/UltraLightScans.kt
new file mode 100644
index 000000000..57f7a331b
--- /dev/null
+++ b/src/en/ultralightscans/src/eu/kanade/tachiyomi/extension/en/ultralightscans/UltraLightScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.ultralightscans
+
+import eu.kanade.tachiyomi.multisrc.bakkin.BakkinReaderX
+
+class UltraLightScans : BakkinReaderX("UltraLight Scans", "https://readlight.org/", "en")
diff --git a/src/en/vinmanga/build.gradle b/src/en/vinmanga/build.gradle
new file mode 100644
index 000000000..e6263ab5b
--- /dev/null
+++ b/src/en/vinmanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'VinManga'
+ extClass = '.VinManga'
+ themePkg = 'madara'
+ baseUrl = 'https://vinload.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/vinmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/vinmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/vinmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/vinmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/vinmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/vinmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/vinmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/vinmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/vinmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/vinmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/vinmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/vinmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/vinmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/vinmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/vinmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/vinmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/vinmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/vinmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/vinmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/vinmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/vinmanga/src/VinManga.kt b/src/en/vinmanga/src/eu/kanade/tachiyomi/extension/en/vinmanga/VinManga.kt
similarity index 100%
rename from multisrc/overrides/madara/vinmanga/src/VinManga.kt
rename to src/en/vinmanga/src/eu/kanade/tachiyomi/extension/en/vinmanga/VinManga.kt
diff --git a/src/en/wakamics/build.gradle b/src/en/wakamics/build.gradle
new file mode 100644
index 000000000..2f12421b2
--- /dev/null
+++ b/src/en/wakamics/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Wakamics'
+ extClass = '.Wakamics'
+ themePkg = 'madara'
+ baseUrl = 'https://wakamics.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/wakamics/res/mipmap-hdpi/ic_launcher.png b/src/en/wakamics/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/wakamics/res/mipmap-hdpi/ic_launcher.png
rename to src/en/wakamics/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/wakamics/res/mipmap-mdpi/ic_launcher.png b/src/en/wakamics/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/wakamics/res/mipmap-mdpi/ic_launcher.png
rename to src/en/wakamics/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/wakamics/res/mipmap-xhdpi/ic_launcher.png b/src/en/wakamics/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/wakamics/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/wakamics/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/wakamics/res/mipmap-xxhdpi/ic_launcher.png b/src/en/wakamics/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/wakamics/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/wakamics/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/wakamics/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/wakamics/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/wakamics/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/wakamics/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/wakamics/src/eu/kanade/tachiyomi/extension/en/wakamics/Wakamics.kt b/src/en/wakamics/src/eu/kanade/tachiyomi/extension/en/wakamics/Wakamics.kt
new file mode 100644
index 000000000..2935d5543
--- /dev/null
+++ b/src/en/wakamics/src/eu/kanade/tachiyomi/extension/en/wakamics/Wakamics.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.wakamics
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Wakamics : Madara("Wakamics", "https://wakamics.net", "en")
diff --git a/src/en/webdexscans/build.gradle b/src/en/webdexscans/build.gradle
new file mode 100644
index 000000000..b67c70849
--- /dev/null
+++ b/src/en/webdexscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Webdex Scans'
+ extClass = '.WebdexScans'
+ themePkg = 'madara'
+ baseUrl = 'https://webdexscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/webdexscans/res/mipmap-hdpi/ic_launcher.png b/src/en/webdexscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webdexscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/webdexscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webdexscans/res/mipmap-mdpi/ic_launcher.png b/src/en/webdexscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webdexscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/webdexscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webdexscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/webdexscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webdexscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/webdexscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webdexscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/webdexscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webdexscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/webdexscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webdexscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/webdexscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webdexscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/webdexscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webdexscans/src/WebdexScans.kt b/src/en/webdexscans/src/eu/kanade/tachiyomi/extension/en/webdexscans/WebdexScans.kt
similarity index 100%
rename from multisrc/overrides/madara/webdexscans/src/WebdexScans.kt
rename to src/en/webdexscans/src/eu/kanade/tachiyomi/extension/en/webdexscans/WebdexScans.kt
diff --git a/src/en/webtooncity/build.gradle b/src/en/webtooncity/build.gradle
new file mode 100644
index 000000000..e72ae7432
--- /dev/null
+++ b/src/en/webtooncity/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Webtoon City'
+ extClass = '.WebtoonCity'
+ themePkg = 'madara'
+ baseUrl = 'https://webtooncity.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/webtooncity/src/WebtoonCity.kt b/src/en/webtooncity/src/eu/kanade/tachiyomi/extension/en/webtooncity/WebtoonCity.kt
similarity index 100%
rename from multisrc/overrides/madara/webtooncity/src/WebtoonCity.kt
rename to src/en/webtooncity/src/eu/kanade/tachiyomi/extension/en/webtooncity/WebtoonCity.kt
diff --git a/src/en/webtoonily/build.gradle b/src/en/webtoonily/build.gradle
new file mode 100644
index 000000000..8a70684c8
--- /dev/null
+++ b/src/en/webtoonily/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'WebToonily'
+ extClass = '.WebToonily'
+ themePkg = 'madara'
+ baseUrl = 'https://webtoonily.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/webtoonily/res/mipmap-hdpi/ic_launcher.png b/src/en/webtoonily/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonily/res/mipmap-hdpi/ic_launcher.png
rename to src/en/webtoonily/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonily/res/mipmap-mdpi/ic_launcher.png b/src/en/webtoonily/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonily/res/mipmap-mdpi/ic_launcher.png
rename to src/en/webtoonily/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonily/res/mipmap-xhdpi/ic_launcher.png b/src/en/webtoonily/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonily/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/webtoonily/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonily/res/mipmap-xxhdpi/ic_launcher.png b/src/en/webtoonily/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonily/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/webtoonily/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonily/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/webtoonily/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonily/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/webtoonily/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/webtoonily/src/eu/kanade/tachiyomi/extension/en/webtoonily/WebToonily.kt b/src/en/webtoonily/src/eu/kanade/tachiyomi/extension/en/webtoonily/WebToonily.kt
new file mode 100644
index 000000000..2e9c5cec6
--- /dev/null
+++ b/src/en/webtoonily/src/eu/kanade/tachiyomi/extension/en/webtoonily/WebToonily.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.webtoonily
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class WebToonily : Madara("WebToonily", "https://webtoonily.com", "en")
diff --git a/src/en/webtoonscan/build.gradle b/src/en/webtoonscan/build.gradle
new file mode 100644
index 000000000..4ed8c8cc7
--- /dev/null
+++ b/src/en/webtoonscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'WebtoonScan'
+ extClass = '.WebtoonScan'
+ themePkg = 'madara'
+ baseUrl = 'https://webtoonscan.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/webtoonscan/res/mipmap-hdpi/ic_launcher.png b/src/en/webtoonscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonscan/res/mipmap-hdpi/ic_launcher.png
rename to src/en/webtoonscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonscan/res/mipmap-mdpi/ic_launcher.png b/src/en/webtoonscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonscan/res/mipmap-mdpi/ic_launcher.png
rename to src/en/webtoonscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonscan/res/mipmap-xhdpi/ic_launcher.png b/src/en/webtoonscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/webtoonscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonscan/res/mipmap-xxhdpi/ic_launcher.png b/src/en/webtoonscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/webtoonscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/webtoonscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/webtoonscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/webtoonscan/src/eu/kanade/tachiyomi/extension/en/webtoonscan/WebtoonScan.kt b/src/en/webtoonscan/src/eu/kanade/tachiyomi/extension/en/webtoonscan/WebtoonScan.kt
new file mode 100644
index 000000000..601542d54
--- /dev/null
+++ b/src/en/webtoonscan/src/eu/kanade/tachiyomi/extension/en/webtoonscan/WebtoonScan.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.webtoonscan
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class WebtoonScan : Madara("WebtoonScan", "https://webtoonscan.com", "en")
diff --git a/src/en/webtoonstop/build.gradle b/src/en/webtoonstop/build.gradle
new file mode 100644
index 000000000..31ab1da03
--- /dev/null
+++ b/src/en/webtoonstop/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'WebtoonsTOP'
+ extClass = '.WebtoonsTOP'
+ themePkg = 'madara'
+ baseUrl = 'https://webtoons.top'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/webtoonstop/res/mipmap-hdpi/ic_launcher.png b/src/en/webtoonstop/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonstop/res/mipmap-hdpi/ic_launcher.png
rename to src/en/webtoonstop/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonstop/res/mipmap-mdpi/ic_launcher.png b/src/en/webtoonstop/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonstop/res/mipmap-mdpi/ic_launcher.png
rename to src/en/webtoonstop/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonstop/res/mipmap-xhdpi/ic_launcher.png b/src/en/webtoonstop/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonstop/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/webtoonstop/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonstop/res/mipmap-xxhdpi/ic_launcher.png b/src/en/webtoonstop/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonstop/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/webtoonstop/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonstop/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/webtoonstop/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonstop/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/webtoonstop/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonstop/src/WebtoonsTOP.kt b/src/en/webtoonstop/src/eu/kanade/tachiyomi/extension/en/webtoonstop/WebtoonsTOP.kt
similarity index 100%
rename from multisrc/overrides/madara/webtoonstop/src/WebtoonsTOP.kt
rename to src/en/webtoonstop/src/eu/kanade/tachiyomi/extension/en/webtoonstop/WebtoonsTOP.kt
diff --git a/src/en/webtoonuk/build.gradle b/src/en/webtoonuk/build.gradle
new file mode 100644
index 000000000..0cc12c105
--- /dev/null
+++ b/src/en/webtoonuk/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'WebtoonUK'
+ extClass = '.WebtoonUK'
+ themePkg = 'madara'
+ baseUrl = 'https://webtoon.uk'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/webtoonuk/res/mipmap-hdpi/ic_launcher.png b/src/en/webtoonuk/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonuk/res/mipmap-hdpi/ic_launcher.png
rename to src/en/webtoonuk/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonuk/res/mipmap-mdpi/ic_launcher.png b/src/en/webtoonuk/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonuk/res/mipmap-mdpi/ic_launcher.png
rename to src/en/webtoonuk/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonuk/res/mipmap-xhdpi/ic_launcher.png b/src/en/webtoonuk/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonuk/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/webtoonuk/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonuk/res/mipmap-xxhdpi/ic_launcher.png b/src/en/webtoonuk/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonuk/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/webtoonuk/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonuk/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/webtoonuk/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonuk/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/webtoonuk/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/webtoonuk/src/eu/kanade/tachiyomi/extension/en/webtoonuk/WebtoonUK.kt b/src/en/webtoonuk/src/eu/kanade/tachiyomi/extension/en/webtoonuk/WebtoonUK.kt
new file mode 100644
index 000000000..f09b7cd5f
--- /dev/null
+++ b/src/en/webtoonuk/src/eu/kanade/tachiyomi/extension/en/webtoonuk/WebtoonUK.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.webtoonuk
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class WebtoonUK : Madara("WebtoonUK", "https://webtoon.uk", "en")
diff --git a/src/en/webtoonxyz/build.gradle b/src/en/webtoonxyz/build.gradle
new file mode 100644
index 000000000..7156d4553
--- /dev/null
+++ b/src/en/webtoonxyz/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'WebtoonXYZ'
+ extClass = '.WebtoonXYZ'
+ themePkg = 'madara'
+ baseUrl = 'https://www.webtoon.xyz'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/webtoonxyz/res/mipmap-hdpi/ic_launcher.png b/src/en/webtoonxyz/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonxyz/res/mipmap-hdpi/ic_launcher.png
rename to src/en/webtoonxyz/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonxyz/res/mipmap-mdpi/ic_launcher.png b/src/en/webtoonxyz/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonxyz/res/mipmap-mdpi/ic_launcher.png
rename to src/en/webtoonxyz/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonxyz/res/mipmap-xhdpi/ic_launcher.png b/src/en/webtoonxyz/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonxyz/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/webtoonxyz/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonxyz/res/mipmap-xxhdpi/ic_launcher.png b/src/en/webtoonxyz/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonxyz/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/webtoonxyz/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonxyz/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/webtoonxyz/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonxyz/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/webtoonxyz/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonxyz/src/WebtoonXYZ.kt b/src/en/webtoonxyz/src/eu/kanade/tachiyomi/extension/en/webtoonxyz/WebtoonXYZ.kt
similarity index 100%
rename from multisrc/overrides/madara/webtoonxyz/src/WebtoonXYZ.kt
rename to src/en/webtoonxyz/src/eu/kanade/tachiyomi/extension/en/webtoonxyz/WebtoonXYZ.kt
diff --git a/src/en/whalemanga/build.gradle b/src/en/whalemanga/build.gradle
new file mode 100644
index 000000000..e4efcae97
--- /dev/null
+++ b/src/en/whalemanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Whale Manga'
+ extClass = '.WhaleManga'
+ themePkg = 'madara'
+ baseUrl = 'https://whalemanga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/whalemanga/res/mipmap-hdpi/ic_launcher.png b/src/en/whalemanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/whalemanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/whalemanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/whalemanga/res/mipmap-mdpi/ic_launcher.png b/src/en/whalemanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/whalemanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/whalemanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/whalemanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/whalemanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/whalemanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/whalemanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/whalemanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/whalemanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/whalemanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/whalemanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/whalemanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/whalemanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/whalemanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/whalemanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/whalemanga/src/WhaleManga.kt b/src/en/whalemanga/src/eu/kanade/tachiyomi/extension/en/whalemanga/WhaleManga.kt
similarity index 100%
rename from multisrc/overrides/madara/whalemanga/src/WhaleManga.kt
rename to src/en/whalemanga/src/eu/kanade/tachiyomi/extension/en/whalemanga/WhaleManga.kt
diff --git a/src/en/woopread/build.gradle b/src/en/woopread/build.gradle
new file mode 100644
index 000000000..34234ed05
--- /dev/null
+++ b/src/en/woopread/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'WoopRead'
+ extClass = '.WoopRead'
+ themePkg = 'madara'
+ baseUrl = 'https://woopread.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/woopread/res/mipmap-hdpi/ic_launcher.png b/src/en/woopread/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/woopread/res/mipmap-hdpi/ic_launcher.png
rename to src/en/woopread/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/woopread/res/mipmap-mdpi/ic_launcher.png b/src/en/woopread/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/woopread/res/mipmap-mdpi/ic_launcher.png
rename to src/en/woopread/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/woopread/res/mipmap-xhdpi/ic_launcher.png b/src/en/woopread/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/woopread/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/woopread/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/woopread/res/mipmap-xxhdpi/ic_launcher.png b/src/en/woopread/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/woopread/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/woopread/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/woopread/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/woopread/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/woopread/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/woopread/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/woopread/src/eu/kanade/tachiyomi/extension/en/woopread/WoopRead.kt b/src/en/woopread/src/eu/kanade/tachiyomi/extension/en/woopread/WoopRead.kt
new file mode 100644
index 000000000..e67f0a545
--- /dev/null
+++ b/src/en/woopread/src/eu/kanade/tachiyomi/extension/en/woopread/WoopRead.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.woopread
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class WoopRead : Madara("WoopRead", "https://woopread.com", "en")
diff --git a/src/en/wuxiaworld/build.gradle b/src/en/wuxiaworld/build.gradle
new file mode 100644
index 000000000..c7b92f6f5
--- /dev/null
+++ b/src/en/wuxiaworld/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'WuxiaWorld'
+ extClass = '.WuxiaWorld'
+ themePkg = 'madara'
+ baseUrl = 'https://wuxiaworld.site'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/wuxiaworld/res/mipmap-hdpi/ic_launcher.png b/src/en/wuxiaworld/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/wuxiaworld/res/mipmap-hdpi/ic_launcher.png
rename to src/en/wuxiaworld/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/wuxiaworld/res/mipmap-mdpi/ic_launcher.png b/src/en/wuxiaworld/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/wuxiaworld/res/mipmap-mdpi/ic_launcher.png
rename to src/en/wuxiaworld/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/wuxiaworld/res/mipmap-xhdpi/ic_launcher.png b/src/en/wuxiaworld/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/wuxiaworld/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/wuxiaworld/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/wuxiaworld/res/mipmap-xxhdpi/ic_launcher.png b/src/en/wuxiaworld/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/wuxiaworld/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/wuxiaworld/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/wuxiaworld/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/wuxiaworld/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/wuxiaworld/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/wuxiaworld/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/wuxiaworld/src/WuxiaWorld.kt b/src/en/wuxiaworld/src/eu/kanade/tachiyomi/extension/en/wuxiaworld/WuxiaWorld.kt
similarity index 100%
rename from multisrc/overrides/madara/wuxiaworld/src/WuxiaWorld.kt
rename to src/en/wuxiaworld/src/eu/kanade/tachiyomi/extension/en/wuxiaworld/WuxiaWorld.kt
diff --git a/src/en/xcalibrscans/build.gradle b/src/en/xcalibrscans/build.gradle
new file mode 100644
index 000000000..46be2fcbd
--- /dev/null
+++ b/src/en/xcalibrscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'xCaliBR Scans'
+ extClass = '.xCaliBRScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://xcalibrscans.com'
+ overrideVersionCode = 5
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/xcalibrscans/res/mipmap-hdpi/ic_launcher.png b/src/en/xcalibrscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/xcalibrscans/res/mipmap-hdpi/ic_launcher.png
rename to src/en/xcalibrscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/xcalibrscans/res/mipmap-mdpi/ic_launcher.png b/src/en/xcalibrscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/xcalibrscans/res/mipmap-mdpi/ic_launcher.png
rename to src/en/xcalibrscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/xcalibrscans/res/mipmap-xhdpi/ic_launcher.png b/src/en/xcalibrscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/xcalibrscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/xcalibrscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/xcalibrscans/res/mipmap-xxhdpi/ic_launcher.png b/src/en/xcalibrscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/xcalibrscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/xcalibrscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/xcalibrscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/xcalibrscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/xcalibrscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/xcalibrscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/xcalibrscans/src/AntiScrapInterceptor.kt b/src/en/xcalibrscans/src/eu/kanade/tachiyomi/extension/en/xcalibrscans/AntiScrapInterceptor.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/xcalibrscans/src/AntiScrapInterceptor.kt
rename to src/en/xcalibrscans/src/eu/kanade/tachiyomi/extension/en/xcalibrscans/AntiScrapInterceptor.kt
diff --git a/multisrc/overrides/mangathemesia/xcalibrscans/src/xCaliBRScans.kt b/src/en/xcalibrscans/src/eu/kanade/tachiyomi/extension/en/xcalibrscans/xCaliBRScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/xcalibrscans/src/xCaliBRScans.kt
rename to src/en/xcalibrscans/src/eu/kanade/tachiyomi/extension/en/xcalibrscans/xCaliBRScans.kt
diff --git a/src/en/xoxocomics/build.gradle b/src/en/xoxocomics/build.gradle
new file mode 100644
index 000000000..d07cd7f5b
--- /dev/null
+++ b/src/en/xoxocomics/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'XOXO Comics'
+ extClass = '.XoxoComics'
+ themePkg = 'wpcomics'
+ baseUrl = 'https://xoxocomic.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/wpcomics/xoxocomics/res/mipmap-hdpi/ic_launcher.png b/src/en/xoxocomics/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/xoxocomics/res/mipmap-hdpi/ic_launcher.png
rename to src/en/xoxocomics/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/xoxocomics/res/mipmap-mdpi/ic_launcher.png b/src/en/xoxocomics/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/xoxocomics/res/mipmap-mdpi/ic_launcher.png
rename to src/en/xoxocomics/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/xoxocomics/res/mipmap-xhdpi/ic_launcher.png b/src/en/xoxocomics/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/xoxocomics/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/xoxocomics/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/xoxocomics/res/mipmap-xxhdpi/ic_launcher.png b/src/en/xoxocomics/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/xoxocomics/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/xoxocomics/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/xoxocomics/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/xoxocomics/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/xoxocomics/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/xoxocomics/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/xoxocomics/src/XoxoComics.kt b/src/en/xoxocomics/src/eu/kanade/tachiyomi/extension/en/xoxocomics/XoxoComics.kt
similarity index 100%
rename from multisrc/overrides/wpcomics/xoxocomics/src/XoxoComics.kt
rename to src/en/xoxocomics/src/eu/kanade/tachiyomi/extension/en/xoxocomics/XoxoComics.kt
diff --git a/src/en/yaoihentai/build.gradle b/src/en/yaoihentai/build.gradle
new file mode 100644
index 000000000..4c03a58ec
--- /dev/null
+++ b/src/en/yaoihentai/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Yaoi Hentai'
+ extClass = '.YaoiHentai'
+ themePkg = 'madara'
+ baseUrl = 'https://yaoihentai.me'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/yaoihentai/res/mipmap-hdpi/ic_launcher.png b/src/en/yaoihentai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoihentai/res/mipmap-hdpi/ic_launcher.png
rename to src/en/yaoihentai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoihentai/res/mipmap-mdpi/ic_launcher.png b/src/en/yaoihentai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoihentai/res/mipmap-mdpi/ic_launcher.png
rename to src/en/yaoihentai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoihentai/res/mipmap-xhdpi/ic_launcher.png b/src/en/yaoihentai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoihentai/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/yaoihentai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoihentai/res/mipmap-xxhdpi/ic_launcher.png b/src/en/yaoihentai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoihentai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/yaoihentai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoihentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/yaoihentai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoihentai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/yaoihentai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoihentai/src/YaoiHentai.kt b/src/en/yaoihentai/src/eu/kanade/tachiyomi/extension/en/yaoihentai/YaoiHentai.kt
similarity index 100%
rename from multisrc/overrides/madara/yaoihentai/src/YaoiHentai.kt
rename to src/en/yaoihentai/src/eu/kanade/tachiyomi/extension/en/yaoihentai/YaoiHentai.kt
diff --git a/src/en/yaoimanga/build.gradle b/src/en/yaoimanga/build.gradle
new file mode 100644
index 000000000..4a05da9eb
--- /dev/null
+++ b/src/en/yaoimanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Yaoi.mobi'
+ extClass = '.YaoiManga'
+ themePkg = 'madara'
+ baseUrl = 'https://yaoi.mobi'
+ overrideVersionCode = 4
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/yaoimanga/res/mipmap-hdpi/ic_launcher.png b/src/en/yaoimanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoimanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/yaoimanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoimanga/res/mipmap-mdpi/ic_launcher.png b/src/en/yaoimanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoimanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/yaoimanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoimanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/yaoimanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoimanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/yaoimanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoimanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/yaoimanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoimanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/yaoimanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoimanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/yaoimanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoimanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/yaoimanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoimanga/src/YaoiManga.kt b/src/en/yaoimanga/src/eu/kanade/tachiyomi/extension/en/yaoimanga/YaoiManga.kt
similarity index 100%
rename from multisrc/overrides/madara/yaoimanga/src/YaoiManga.kt
rename to src/en/yaoimanga/src/eu/kanade/tachiyomi/extension/en/yaoimanga/YaoiManga.kt
diff --git a/src/en/yaoiscan/build.gradle b/src/en/yaoiscan/build.gradle
new file mode 100644
index 000000000..6c63981a2
--- /dev/null
+++ b/src/en/yaoiscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'YaoiScan'
+ extClass = '.YaoiScan'
+ themePkg = 'madara'
+ baseUrl = 'https://yaoiscan.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/yaoiscan/res/mipmap-hdpi/ic_launcher.png b/src/en/yaoiscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoiscan/res/mipmap-hdpi/ic_launcher.png
rename to src/en/yaoiscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoiscan/res/mipmap-mdpi/ic_launcher.png b/src/en/yaoiscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoiscan/res/mipmap-mdpi/ic_launcher.png
rename to src/en/yaoiscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoiscan/res/mipmap-xhdpi/ic_launcher.png b/src/en/yaoiscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoiscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/yaoiscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoiscan/res/mipmap-xxhdpi/ic_launcher.png b/src/en/yaoiscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoiscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/yaoiscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoiscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/yaoiscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoiscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/yaoiscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/yaoiscan/src/eu/kanade/tachiyomi/extension/en/yaoiscan/YaoiScan.kt b/src/en/yaoiscan/src/eu/kanade/tachiyomi/extension/en/yaoiscan/YaoiScan.kt
new file mode 100644
index 000000000..7aa672694
--- /dev/null
+++ b/src/en/yaoiscan/src/eu/kanade/tachiyomi/extension/en/yaoiscan/YaoiScan.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.yaoiscan
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class YaoiScan : Madara("YaoiScan", "https://yaoiscan.com", "en")
diff --git a/src/en/yaoitoon/build.gradle b/src/en/yaoitoon/build.gradle
new file mode 100644
index 000000000..25c8e3af2
--- /dev/null
+++ b/src/en/yaoitoon/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'YaoiToon'
+ extClass = '.YaoiToon'
+ themePkg = 'madara'
+ baseUrl = 'https://yaoitoon.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/yaoitoon/res/mipmap-hdpi/ic_launcher.png b/src/en/yaoitoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoitoon/res/mipmap-hdpi/ic_launcher.png
rename to src/en/yaoitoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoitoon/res/mipmap-mdpi/ic_launcher.png b/src/en/yaoitoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoitoon/res/mipmap-mdpi/ic_launcher.png
rename to src/en/yaoitoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoitoon/res/mipmap-xhdpi/ic_launcher.png b/src/en/yaoitoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoitoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/yaoitoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoitoon/res/mipmap-xxhdpi/ic_launcher.png b/src/en/yaoitoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoitoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/yaoitoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoitoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/yaoitoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yaoitoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/yaoitoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yaoitoon/src/YaoiToon.kt b/src/en/yaoitoon/src/eu/kanade/tachiyomi/extension/en/yaoitoon/YaoiToon.kt
similarity index 100%
rename from multisrc/overrides/madara/yaoitoon/src/YaoiToon.kt
rename to src/en/yaoitoon/src/eu/kanade/tachiyomi/extension/en/yaoitoon/YaoiToon.kt
diff --git a/src/en/zahard/build.gradle b/src/en/zahard/build.gradle
new file mode 100644
index 000000000..3bd5fbffa
--- /dev/null
+++ b/src/en/zahard/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Zahard'
+ extClass = '.Zahard'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://zahard.xyz'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/zahard/res/mipmap-hdpi/ic_launcher.png b/src/en/zahard/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/zahard/res/mipmap-hdpi/ic_launcher.png
rename to src/en/zahard/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/zahard/res/mipmap-mdpi/ic_launcher.png b/src/en/zahard/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/zahard/res/mipmap-mdpi/ic_launcher.png
rename to src/en/zahard/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/zahard/res/mipmap-xhdpi/ic_launcher.png b/src/en/zahard/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/zahard/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/zahard/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/zahard/res/mipmap-xxhdpi/ic_launcher.png b/src/en/zahard/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/zahard/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/zahard/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/zahard/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/zahard/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/zahard/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/zahard/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/zahard/src/Zahard.kt b/src/en/zahard/src/eu/kanade/tachiyomi/extension/en/zahard/Zahard.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/zahard/src/Zahard.kt
rename to src/en/zahard/src/eu/kanade/tachiyomi/extension/en/zahard/Zahard.kt
diff --git a/src/en/zandynofansub/build.gradle b/src/en/zandynofansub/build.gradle
new file mode 100644
index 000000000..4262ca330
--- /dev/null
+++ b/src/en/zandynofansub/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Zandy no Fansub'
+ extClass = '.ZandynoFansub'
+ themePkg = 'madara'
+ baseUrl = 'https://zandynofansub.aishiteru.org'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/zandynofansub/res/mipmap-hdpi/ic_launcher.png b/src/en/zandynofansub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zandynofansub/res/mipmap-hdpi/ic_launcher.png
rename to src/en/zandynofansub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zandynofansub/res/mipmap-mdpi/ic_launcher.png b/src/en/zandynofansub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zandynofansub/res/mipmap-mdpi/ic_launcher.png
rename to src/en/zandynofansub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zandynofansub/res/mipmap-xhdpi/ic_launcher.png b/src/en/zandynofansub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zandynofansub/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/zandynofansub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zandynofansub/res/mipmap-xxhdpi/ic_launcher.png b/src/en/zandynofansub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zandynofansub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/zandynofansub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zandynofansub/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/zandynofansub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zandynofansub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/zandynofansub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zandynofansub/src/ZandynoFansub.kt b/src/en/zandynofansub/src/eu/kanade/tachiyomi/extension/en/zandynofansub/ZandynoFansub.kt
similarity index 100%
rename from multisrc/overrides/madara/zandynofansub/src/ZandynoFansub.kt
rename to src/en/zandynofansub/src/eu/kanade/tachiyomi/extension/en/zandynofansub/ZandynoFansub.kt
diff --git a/src/en/zinchanmanga/build.gradle b/src/en/zinchanmanga/build.gradle
new file mode 100644
index 000000000..ed4cd9a54
--- /dev/null
+++ b/src/en/zinchanmanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ZinChanManga'
+ extClass = '.ZinChanManga'
+ themePkg = 'madara'
+ baseUrl = 'https://zinchanmanga.net'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/zinchanmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/zinchanmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zinchanmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/zinchanmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zinchanmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/zinchanmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zinchanmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/zinchanmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zinchanmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/zinchanmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zinchanmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/zinchanmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zinchanmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/zinchanmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zinchanmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/zinchanmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zinchanmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/zinchanmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zinchanmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/zinchanmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zinchanmanga/src/ZinChanManga.kt b/src/en/zinchanmanga/src/eu/kanade/tachiyomi/extension/en/zinchanmanga/ZinChanManga.kt
similarity index 100%
rename from multisrc/overrides/madara/zinchanmanga/src/ZinChanManga.kt
rename to src/en/zinchanmanga/src/eu/kanade/tachiyomi/extension/en/zinchanmanga/ZinChanManga.kt
diff --git a/src/en/zinmanga/build.gradle b/src/en/zinmanga/build.gradle
new file mode 100644
index 000000000..260d6d83f
--- /dev/null
+++ b/src/en/zinmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Zinmanga'
+ extClass = '.Zinmanga'
+ themePkg = 'madara'
+ baseUrl = 'https://zinmanga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/likemanga/zinmanhwa/res/mipmap-hdpi/ic_launcher.png b/src/en/zinmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/likemanga/zinmanhwa/res/mipmap-hdpi/ic_launcher.png
rename to src/en/zinmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/likemanga/zinmanhwa/res/mipmap-mdpi/ic_launcher.png b/src/en/zinmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/likemanga/zinmanhwa/res/mipmap-mdpi/ic_launcher.png
rename to src/en/zinmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/likemanga/zinmanhwa/res/mipmap-xhdpi/ic_launcher.png b/src/en/zinmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/likemanga/zinmanhwa/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/zinmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/likemanga/zinmanhwa/res/mipmap-xxhdpi/ic_launcher.png b/src/en/zinmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/likemanga/zinmanhwa/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/zinmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/likemanga/zinmanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/zinmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/likemanga/zinmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/zinmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zinmanga/src/Zinmanga.kt b/src/en/zinmanga/src/eu/kanade/tachiyomi/extension/en/zinmanga/Zinmanga.kt
similarity index 100%
rename from multisrc/overrides/madara/zinmanga/src/Zinmanga.kt
rename to src/en/zinmanga/src/eu/kanade/tachiyomi/extension/en/zinmanga/Zinmanga.kt
diff --git a/src/en/zinmanhwa/build.gradle b/src/en/zinmanhwa/build.gradle
new file mode 100644
index 000000000..231d16691
--- /dev/null
+++ b/src/en/zinmanhwa/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ZinManga.io'
+ extClass = '.ZinMangaIO'
+ themePkg = 'likemanga'
+ baseUrl = 'https://zinmanga.io'
+ overrideVersionCode = 34
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/zinmanga/res/mipmap-hdpi/ic_launcher.png b/src/en/zinmanhwa/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zinmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/zinmanhwa/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zinmanga/res/mipmap-mdpi/ic_launcher.png b/src/en/zinmanhwa/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zinmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/zinmanhwa/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zinmanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/zinmanhwa/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zinmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/zinmanhwa/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zinmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/zinmanhwa/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zinmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/zinmanhwa/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zinmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/zinmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zinmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/zinmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/likemanga/zinmanhwa/src/ZinMangaIO.kt b/src/en/zinmanhwa/src/eu/kanade/tachiyomi/extension/en/zinmanhwa/ZinMangaIO.kt
similarity index 100%
rename from multisrc/overrides/likemanga/zinmanhwa/src/ZinMangaIO.kt
rename to src/en/zinmanhwa/src/eu/kanade/tachiyomi/extension/en/zinmanhwa/ZinMangaIO.kt
diff --git a/src/en/zuttomanga/build.gradle b/src/en/zuttomanga/build.gradle
new file mode 100644
index 000000000..6a8f11b46
--- /dev/null
+++ b/src/en/zuttomanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ZuttoManga'
+ extClass = '.ZuttoManga'
+ themePkg = 'madara'
+ baseUrl = 'https://zuttomanga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/zuttomanga/res/mipmap-hdpi/ic_launcher.png b/src/en/zuttomanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zuttomanga/res/mipmap-hdpi/ic_launcher.png
rename to src/en/zuttomanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zuttomanga/res/mipmap-mdpi/ic_launcher.png b/src/en/zuttomanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zuttomanga/res/mipmap-mdpi/ic_launcher.png
rename to src/en/zuttomanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zuttomanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/zuttomanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zuttomanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/en/zuttomanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zuttomanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/zuttomanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zuttomanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/en/zuttomanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/zuttomanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/zuttomanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/zuttomanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/en/zuttomanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/en/zuttomanga/src/eu/kanade/tachiyomi/extension/en/zuttomanga/ZuttoManga.kt b/src/en/zuttomanga/src/eu/kanade/tachiyomi/extension/en/zuttomanga/ZuttoManga.kt
new file mode 100644
index 000000000..3f1807b5c
--- /dev/null
+++ b/src/en/zuttomanga/src/eu/kanade/tachiyomi/extension/en/zuttomanga/ZuttoManga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.en.zuttomanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class ZuttoManga : Madara("ZuttoManga", "https://zuttomanga.com", "en")
diff --git a/src/es/aiyumanga/build.gradle b/src/es/aiyumanga/build.gradle
new file mode 100644
index 000000000..791ac115e
--- /dev/null
+++ b/src/es/aiyumanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'AiYuManhua'
+ extClass = '.AiYuManhua'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://www.aiyumanhua.com'
+ overrideVersionCode = 28
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/aiyumanga/res/mipmap-hdpi/ic_launcher.png b/src/es/aiyumanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/aiyumanga/res/mipmap-hdpi/ic_launcher.png
rename to src/es/aiyumanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/aiyumanga/res/mipmap-mdpi/ic_launcher.png b/src/es/aiyumanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/aiyumanga/res/mipmap-mdpi/ic_launcher.png
rename to src/es/aiyumanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/aiyumanga/res/mipmap-xhdpi/ic_launcher.png b/src/es/aiyumanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/aiyumanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/aiyumanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/aiyumanga/res/mipmap-xxhdpi/ic_launcher.png b/src/es/aiyumanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/aiyumanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/aiyumanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/aiyumanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/aiyumanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/aiyumanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/aiyumanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/aiyumanga/src/AiYuManhua.kt b/src/es/aiyumanga/src/eu/kanade/tachiyomi/extension/es/aiyumanga/AiYuManhua.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/aiyumanga/src/AiYuManhua.kt
rename to src/es/aiyumanga/src/eu/kanade/tachiyomi/extension/es/aiyumanga/AiYuManhua.kt
diff --git a/src/es/apollcomics/build.gradle b/src/es/apollcomics/build.gradle
new file mode 100644
index 000000000..4cab13ee3
--- /dev/null
+++ b/src/es/apollcomics/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ApollComics'
+ extClass = '.ApollComics'
+ themePkg = 'madara'
+ baseUrl = 'https://apollcomics.xyz'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/apollcomics/res/mipmap-hdpi/ic_launcher.png b/src/es/apollcomics/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/apollcomics/res/mipmap-hdpi/ic_launcher.png
rename to src/es/apollcomics/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/apollcomics/res/mipmap-mdpi/ic_launcher.png b/src/es/apollcomics/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/apollcomics/res/mipmap-mdpi/ic_launcher.png
rename to src/es/apollcomics/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/apollcomics/res/mipmap-xhdpi/ic_launcher.png b/src/es/apollcomics/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/apollcomics/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/apollcomics/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/apollcomics/res/mipmap-xxhdpi/ic_launcher.png b/src/es/apollcomics/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/apollcomics/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/apollcomics/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/apollcomics/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/apollcomics/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/apollcomics/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/apollcomics/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/apollcomics/src/ApollComics.kt b/src/es/apollcomics/src/eu/kanade/tachiyomi/extension/es/apollcomics/ApollComics.kt
similarity index 100%
rename from multisrc/overrides/madara/apollcomics/src/ApollComics.kt
rename to src/es/apollcomics/src/eu/kanade/tachiyomi/extension/es/apollcomics/ApollComics.kt
diff --git a/src/es/apolltoons/build.gradle b/src/es/apolltoons/build.gradle
new file mode 100644
index 000000000..98cae778b
--- /dev/null
+++ b/src/es/apolltoons/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Apolltoons'
+ extClass = '.Apolltoons'
+ themePkg = 'madara'
+ baseUrl = 'https://apolltoons.xyz'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/apolltoons/res/mipmap-hdpi/ic_launcher.png b/src/es/apolltoons/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/apolltoons/res/mipmap-hdpi/ic_launcher.png
rename to src/es/apolltoons/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/apolltoons/res/mipmap-mdpi/ic_launcher.png b/src/es/apolltoons/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/apolltoons/res/mipmap-mdpi/ic_launcher.png
rename to src/es/apolltoons/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/apolltoons/res/mipmap-xhdpi/ic_launcher.png b/src/es/apolltoons/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/apolltoons/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/apolltoons/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/apolltoons/res/mipmap-xxhdpi/ic_launcher.png b/src/es/apolltoons/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/apolltoons/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/apolltoons/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/apolltoons/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/apolltoons/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/apolltoons/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/apolltoons/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/apolltoons/src/Apolltoons.kt b/src/es/apolltoons/src/eu/kanade/tachiyomi/extension/es/apolltoons/Apolltoons.kt
similarity index 100%
rename from multisrc/overrides/madara/apolltoons/src/Apolltoons.kt
rename to src/es/apolltoons/src/eu/kanade/tachiyomi/extension/es/apolltoons/Apolltoons.kt
diff --git a/src/es/atlantisscan/build.gradle b/src/es/atlantisscan/build.gradle
new file mode 100644
index 000000000..1649257a1
--- /dev/null
+++ b/src/es/atlantisscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Atlantis Scan'
+ extClass = '.AtlantisScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://scansatlanticos.com'
+ overrideVersionCode = 6
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/atlantisscan/res/mipmap-hdpi/ic_launcher.png b/src/es/atlantisscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/atlantisscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/atlantisscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/atlantisscan/res/mipmap-mdpi/ic_launcher.png b/src/es/atlantisscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/atlantisscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/atlantisscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/atlantisscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/atlantisscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/atlantisscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/atlantisscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/atlantisscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/atlantisscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/atlantisscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/atlantisscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/atlantisscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/atlantisscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/atlantisscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/atlantisscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/atlantisscan/src/AtlantisScan.kt b/src/es/atlantisscan/src/eu/kanade/tachiyomi/extension/es/atlantisscan/AtlantisScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/atlantisscan/src/AtlantisScan.kt
rename to src/es/atlantisscan/src/eu/kanade/tachiyomi/extension/es/atlantisscan/AtlantisScan.kt
diff --git a/src/es/barmanga/build.gradle b/src/es/barmanga/build.gradle
new file mode 100644
index 000000000..c7be12a9f
--- /dev/null
+++ b/src/es/barmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'BarManga'
+ extClass = '.BarManga'
+ themePkg = 'madara'
+ baseUrl = 'https://barmanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/barmanga/res/mipmap-hdpi/ic_launcher.png b/src/es/barmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/barmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/es/barmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/barmanga/res/mipmap-mdpi/ic_launcher.png b/src/es/barmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/barmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/es/barmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/barmanga/res/mipmap-xhdpi/ic_launcher.png b/src/es/barmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/barmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/barmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/barmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/es/barmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/barmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/barmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/barmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/barmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/barmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/barmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/barmanga/src/BarManga.kt b/src/es/barmanga/src/eu/kanade/tachiyomi/extension/es/barmanga/BarManga.kt
similarity index 100%
rename from multisrc/overrides/madara/barmanga/src/BarManga.kt
rename to src/es/barmanga/src/eu/kanade/tachiyomi/extension/es/barmanga/BarManga.kt
diff --git a/src/es/berserkerscan/build.gradle b/src/es/berserkerscan/build.gradle
new file mode 100644
index 000000000..4c7d5691e
--- /dev/null
+++ b/src/es/berserkerscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Berserker Scan'
+ extClass = '.BerserkerScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://ragnascan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/berserkerscan/res/mipmap-hdpi/ic_launcher.png b/src/es/berserkerscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/berserkerscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/berserkerscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/berserkerscan/res/mipmap-mdpi/ic_launcher.png b/src/es/berserkerscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/berserkerscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/berserkerscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/berserkerscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/berserkerscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/berserkerscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/berserkerscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/berserkerscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/berserkerscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/berserkerscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/berserkerscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/berserkerscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/berserkerscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/berserkerscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/berserkerscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/berserkerscan/src/BerserkerScan.kt b/src/es/berserkerscan/src/eu/kanade/tachiyomi/extension/es/berserkerscan/BerserkerScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/berserkerscan/src/BerserkerScan.kt
rename to src/es/berserkerscan/src/eu/kanade/tachiyomi/extension/es/berserkerscan/BerserkerScan.kt
diff --git a/src/es/bokugentranslation/build.gradle b/src/es/bokugentranslation/build.gradle
new file mode 100644
index 000000000..1b450ebb0
--- /dev/null
+++ b/src/es/bokugentranslation/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'BokugenTranslation'
+ extClass = '.BokugenTranslation'
+ themePkg = 'madara'
+ baseUrl = 'https://bokugents.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/bokugentranslation/res/mipmap-hdpi/ic_launcher.png b/src/es/bokugentranslation/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bokugentranslation/res/mipmap-hdpi/ic_launcher.png
rename to src/es/bokugentranslation/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bokugentranslation/res/mipmap-mdpi/ic_launcher.png b/src/es/bokugentranslation/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bokugentranslation/res/mipmap-mdpi/ic_launcher.png
rename to src/es/bokugentranslation/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bokugentranslation/res/mipmap-xhdpi/ic_launcher.png b/src/es/bokugentranslation/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bokugentranslation/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/bokugentranslation/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bokugentranslation/res/mipmap-xxhdpi/ic_launcher.png b/src/es/bokugentranslation/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bokugentranslation/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/bokugentranslation/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bokugentranslation/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/bokugentranslation/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bokugentranslation/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/bokugentranslation/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bokugentranslation/src/BokugenTranslation.kt b/src/es/bokugentranslation/src/eu/kanade/tachiyomi/extension/es/bokugentranslation/BokugenTranslation.kt
similarity index 100%
rename from multisrc/overrides/madara/bokugentranslation/src/BokugenTranslation.kt
rename to src/es/bokugentranslation/src/eu/kanade/tachiyomi/extension/es/bokugentranslation/BokugenTranslation.kt
diff --git a/src/es/carteldemanhwas/build.gradle b/src/es/carteldemanhwas/build.gradle
new file mode 100644
index 000000000..de9bfd587
--- /dev/null
+++ b/src/es/carteldemanhwas/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Cartel de Manhwas'
+ extClass = '.CarteldeManhwas'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://carteldemanhwas.com'
+ overrideVersionCode = 6
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-hdpi/ic_launcher.png b/src/es/carteldemanhwas/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-hdpi/ic_launcher.png
rename to src/es/carteldemanhwas/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-mdpi/ic_launcher.png b/src/es/carteldemanhwas/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-mdpi/ic_launcher.png
rename to src/es/carteldemanhwas/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-xhdpi/ic_launcher.png b/src/es/carteldemanhwas/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/carteldemanhwas/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-xxhdpi/ic_launcher.png b/src/es/carteldemanhwas/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/carteldemanhwas/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/carteldemanhwas/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/carteldemanhwas/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/carteldemanhwas/src/CarteldeManhwas.kt b/src/es/carteldemanhwas/src/eu/kanade/tachiyomi/extension/es/carteldemanhwas/CarteldeManhwas.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/carteldemanhwas/src/CarteldeManhwas.kt
rename to src/es/carteldemanhwas/src/eu/kanade/tachiyomi/extension/es/carteldemanhwas/CarteldeManhwas.kt
diff --git a/src/es/celestialmoon/build.gradle b/src/es/celestialmoon/build.gradle
new file mode 100644
index 000000000..db7e450af
--- /dev/null
+++ b/src/es/celestialmoon/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Celestial Moon'
+ extClass = '.CelestialMoon'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://www.celestialmoonscan.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/celestialmoon/res/mipmap-hdpi/ic_launcher.png b/src/es/celestialmoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/celestialmoon/res/mipmap-hdpi/ic_launcher.png
rename to src/es/celestialmoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/celestialmoon/res/mipmap-mdpi/ic_launcher.png b/src/es/celestialmoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/celestialmoon/res/mipmap-mdpi/ic_launcher.png
rename to src/es/celestialmoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/celestialmoon/res/mipmap-xhdpi/ic_launcher.png b/src/es/celestialmoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/celestialmoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/celestialmoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/celestialmoon/res/mipmap-xxhdpi/ic_launcher.png b/src/es/celestialmoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/celestialmoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/celestialmoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/celestialmoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/celestialmoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/celestialmoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/celestialmoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/es/celestialmoon/src/eu/kanade/tachiyomi/extension/es/celestialmoon/CelestialMoon.kt b/src/es/celestialmoon/src/eu/kanade/tachiyomi/extension/es/celestialmoon/CelestialMoon.kt
new file mode 100644
index 000000000..71a53af99
--- /dev/null
+++ b/src/es/celestialmoon/src/eu/kanade/tachiyomi/extension/es/celestialmoon/CelestialMoon.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.es.celestialmoon
+
+import eu.kanade.tachiyomi.multisrc.zeistmanga.ZeistManga
+
+class CelestialMoon : ZeistManga("Celestial Moon", "https://www.celestialmoonscan.com", "es")
diff --git a/src/es/cocorip/build.gradle b/src/es/cocorip/build.gradle
new file mode 100644
index 000000000..a264a49d3
--- /dev/null
+++ b/src/es/cocorip/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Coco Rip'
+ extClass = '.CocoRip'
+ themePkg = 'madara'
+ baseUrl = 'https://cocorip.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/cocorip/res/res/mipmap-hdpi/ic_launcher.png b/src/es/cocorip/res/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cocorip/res/res/mipmap-hdpi/ic_launcher.png
rename to src/es/cocorip/res/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cocorip/res/res/mipmap-mdpi/ic_launcher.png b/src/es/cocorip/res/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cocorip/res/res/mipmap-mdpi/ic_launcher.png
rename to src/es/cocorip/res/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cocorip/res/res/mipmap-xhdpi/ic_launcher.png b/src/es/cocorip/res/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cocorip/res/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/cocorip/res/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cocorip/res/res/mipmap-xxhdpi/ic_launcher.png b/src/es/cocorip/res/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cocorip/res/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/cocorip/res/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cocorip/res/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/cocorip/res/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cocorip/res/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/cocorip/res/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cocorip/src/CocoRip.kt b/src/es/cocorip/src/eu/kanade/tachiyomi/extension/es/cocorip/CocoRip.kt
similarity index 100%
rename from multisrc/overrides/madara/cocorip/src/CocoRip.kt
rename to src/es/cocorip/src/eu/kanade/tachiyomi/extension/es/cocorip/CocoRip.kt
diff --git a/src/es/copypastescan/build.gradle b/src/es/copypastescan/build.gradle
new file mode 100644
index 000000000..e99c2efbc
--- /dev/null
+++ b/src/es/copypastescan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'CopyPasteScan'
+ extClass = '.CopyPasteScan'
+ themePkg = 'madara'
+ baseUrl = 'https://copypastescan.xyz'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/copypastescan/res/mipmap-hdpi/ic_launcher.png b/src/es/copypastescan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/copypastescan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/copypastescan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/copypastescan/res/mipmap-mdpi/ic_launcher.png b/src/es/copypastescan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/copypastescan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/copypastescan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/copypastescan/res/mipmap-xhdpi/ic_launcher.png b/src/es/copypastescan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/copypastescan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/copypastescan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/copypastescan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/copypastescan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/copypastescan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/copypastescan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/copypastescan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/copypastescan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/copypastescan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/copypastescan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/es/copypastescan/src/eu/kanade/tachiyomi/extension/es/copypastescan/CopyPasteScan.kt b/src/es/copypastescan/src/eu/kanade/tachiyomi/extension/es/copypastescan/CopyPasteScan.kt
new file mode 100644
index 000000000..7ffa4ae5f
--- /dev/null
+++ b/src/es/copypastescan/src/eu/kanade/tachiyomi/extension/es/copypastescan/CopyPasteScan.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.es.copypastescan
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class CopyPasteScan : Madara("CopyPasteScan", "https://copypastescan.xyz", "es")
diff --git a/src/es/daprob/build.gradle b/src/es/daprob/build.gradle
new file mode 100644
index 000000000..d9d20af81
--- /dev/null
+++ b/src/es/daprob/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'DapRob'
+ extClass = '.DapRob'
+ themePkg = 'madara'
+ baseUrl = 'https://daprob.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/daprob/res/mipmap-hdpi/ic_launcher.png b/src/es/daprob/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/daprob/res/mipmap-hdpi/ic_launcher.png
rename to src/es/daprob/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/daprob/res/mipmap-mdpi/ic_launcher.png b/src/es/daprob/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/daprob/res/mipmap-mdpi/ic_launcher.png
rename to src/es/daprob/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/daprob/res/mipmap-xhdpi/ic_launcher.png b/src/es/daprob/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/daprob/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/daprob/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/daprob/res/mipmap-xxhdpi/ic_launcher.png b/src/es/daprob/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/daprob/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/daprob/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/daprob/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/daprob/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/daprob/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/daprob/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/daprob/src/DapRob.kt b/src/es/daprob/src/eu/kanade/tachiyomi/extension/es/daprob/DapRob.kt
similarity index 100%
rename from multisrc/overrides/madara/daprob/src/DapRob.kt
rename to src/es/daprob/src/eu/kanade/tachiyomi/extension/es/daprob/DapRob.kt
diff --git a/src/es/doujinhentai/build.gradle b/src/es/doujinhentai/build.gradle
new file mode 100644
index 000000000..899c60e4c
--- /dev/null
+++ b/src/es/doujinhentai/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'DoujinHentai'
+ extClass = '.DoujinHentai'
+ themePkg = 'madara'
+ baseUrl = 'https://doujinhentai.net'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/doujinhentai/res/mipmap-hdpi/ic_launcher.png b/src/es/doujinhentai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/doujinhentai/res/mipmap-hdpi/ic_launcher.png
rename to src/es/doujinhentai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/doujinhentai/res/mipmap-mdpi/ic_launcher.png b/src/es/doujinhentai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/doujinhentai/res/mipmap-mdpi/ic_launcher.png
rename to src/es/doujinhentai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/doujinhentai/res/mipmap-xhdpi/ic_launcher.png b/src/es/doujinhentai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/doujinhentai/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/doujinhentai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/doujinhentai/res/mipmap-xxhdpi/ic_launcher.png b/src/es/doujinhentai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/doujinhentai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/doujinhentai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/doujinhentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/doujinhentai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/doujinhentai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/doujinhentai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt b/src/es/doujinhentai/src/eu/kanade/tachiyomi/extension/es/doujinhentai/DoujinHentai.kt
similarity index 100%
rename from multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt
rename to src/es/doujinhentai/src/eu/kanade/tachiyomi/extension/es/doujinhentai/DoujinHentai.kt
diff --git a/src/es/dragontranslationnet/build.gradle b/src/es/dragontranslationnet/build.gradle
new file mode 100644
index 000000000..b9b05d2de
--- /dev/null
+++ b/src/es/dragontranslationnet/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'DragonTranslation.net'
+ extClass = '.DragonTranslationNet'
+ themePkg = 'madara'
+ baseUrl = 'https://dragontranslation.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/dragontranslationnet/res/mipmap-hdpi/ic_launcher.png b/src/es/dragontranslationnet/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dragontranslationnet/res/mipmap-hdpi/ic_launcher.png
rename to src/es/dragontranslationnet/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dragontranslationnet/res/mipmap-mdpi/ic_launcher.png b/src/es/dragontranslationnet/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dragontranslationnet/res/mipmap-mdpi/ic_launcher.png
rename to src/es/dragontranslationnet/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dragontranslationnet/res/mipmap-xhdpi/ic_launcher.png b/src/es/dragontranslationnet/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dragontranslationnet/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/dragontranslationnet/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dragontranslationnet/res/mipmap-xxhdpi/ic_launcher.png b/src/es/dragontranslationnet/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dragontranslationnet/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/dragontranslationnet/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dragontranslationnet/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/dragontranslationnet/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dragontranslationnet/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/dragontranslationnet/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dragontranslationnet/src/DragonTranslationNet.kt b/src/es/dragontranslationnet/src/eu/kanade/tachiyomi/extension/es/dragontranslationnet/DragonTranslationNet.kt
similarity index 100%
rename from multisrc/overrides/madara/dragontranslationnet/src/DragonTranslationNet.kt
rename to src/es/dragontranslationnet/src/eu/kanade/tachiyomi/extension/es/dragontranslationnet/DragonTranslationNet.kt
diff --git a/src/es/emperorscan/build.gradle b/src/es/emperorscan/build.gradle
new file mode 100644
index 000000000..f42202e2b
--- /dev/null
+++ b/src/es/emperorscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Emperor Scan'
+ extClass = '.EmperorScan'
+ themePkg = 'madara'
+ baseUrl = 'https://emperorscan.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/emperorscan/res/mipmap-hdpi/ic_launcher.png b/src/es/emperorscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/emperorscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/emperorscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/emperorscan/res/mipmap-mdpi/ic_launcher.png b/src/es/emperorscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/emperorscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/emperorscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/emperorscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/emperorscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/emperorscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/emperorscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/emperorscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/emperorscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/emperorscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/emperorscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/emperorscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/emperorscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/emperorscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/emperorscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/emperorscan/src/EmperorScan.kt b/src/es/emperorscan/src/eu/kanade/tachiyomi/extension/es/emperorscan/EmperorScan.kt
similarity index 100%
rename from multisrc/overrides/madara/emperorscan/src/EmperorScan.kt
rename to src/es/emperorscan/src/eu/kanade/tachiyomi/extension/es/emperorscan/EmperorScan.kt
diff --git a/src/es/eromiau/build.gradle b/src/es/eromiau/build.gradle
new file mode 100644
index 000000000..0cb2dc0bc
--- /dev/null
+++ b/src/es/eromiau/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Eromiau'
+ extClass = '.Eromiau'
+ themePkg = 'madara'
+ baseUrl = 'https://www.eromiau.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/eromiau/res/mipmap-hdpi/ic_launcher.png b/src/es/eromiau/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/eromiau/res/mipmap-hdpi/ic_launcher.png
rename to src/es/eromiau/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/eromiau/res/mipmap-mdpi/ic_launcher.png b/src/es/eromiau/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/eromiau/res/mipmap-mdpi/ic_launcher.png
rename to src/es/eromiau/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/eromiau/res/mipmap-xhdpi/ic_launcher.png b/src/es/eromiau/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/eromiau/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/eromiau/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/eromiau/res/mipmap-xxhdpi/ic_launcher.png b/src/es/eromiau/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/eromiau/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/eromiau/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/eromiau/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/eromiau/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/eromiau/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/eromiau/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/eromiau/src/Eromiau.kt b/src/es/eromiau/src/eu/kanade/tachiyomi/extension/es/eromiau/Eromiau.kt
similarity index 100%
rename from multisrc/overrides/madara/eromiau/src/Eromiau.kt
rename to src/es/eromiau/src/eu/kanade/tachiyomi/extension/es/eromiau/Eromiau.kt
diff --git a/src/es/gremorymangas/build.gradle b/src/es/gremorymangas/build.gradle
new file mode 100644
index 000000000..900ce36ce
--- /dev/null
+++ b/src/es/gremorymangas/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Gremory Mangas'
+ extClass = '.GremoryMangas'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://gremorymangas.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/gremorymangas/res/mipmap-hdpi/ic_launcher.png b/src/es/gremorymangas/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/gremorymangas/res/mipmap-hdpi/ic_launcher.png
rename to src/es/gremorymangas/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/gremorymangas/res/mipmap-mdpi/ic_launcher.png b/src/es/gremorymangas/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/gremorymangas/res/mipmap-mdpi/ic_launcher.png
rename to src/es/gremorymangas/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/gremorymangas/res/mipmap-xhdpi/ic_launcher.png b/src/es/gremorymangas/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/gremorymangas/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/gremorymangas/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/gremorymangas/res/mipmap-xxhdpi/ic_launcher.png b/src/es/gremorymangas/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/gremorymangas/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/gremorymangas/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/gremorymangas/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/gremorymangas/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/gremorymangas/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/gremorymangas/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/es/gremorymangas/src/eu/kanade/tachiyomi/extension/es/gremorymangas/GremoryMangas.kt b/src/es/gremorymangas/src/eu/kanade/tachiyomi/extension/es/gremorymangas/GremoryMangas.kt
new file mode 100644
index 000000000..0a09e395b
--- /dev/null
+++ b/src/es/gremorymangas/src/eu/kanade/tachiyomi/extension/es/gremorymangas/GremoryMangas.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.es.gremorymangas
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class GremoryMangas : MangaThemesia("Gremory Mangas", "https://gremorymangas.com", "es")
diff --git a/src/es/hadesnofansub/build.gradle b/src/es/hadesnofansub/build.gradle
new file mode 100644
index 000000000..f129c9c68
--- /dev/null
+++ b/src/es/hadesnofansub/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hades no Fansub'
+ extClass = '.HadesNoFansub'
+ themePkg = 'madara'
+ baseUrl = 'https://hadesnofansub.com'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hadesnofansub/res/mipmap-hdpi/ic_launcher.png b/src/es/hadesnofansub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hadesnofansub/res/mipmap-hdpi/ic_launcher.png
rename to src/es/hadesnofansub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hadesnofansub/res/mipmap-mdpi/ic_launcher.png b/src/es/hadesnofansub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hadesnofansub/res/mipmap-mdpi/ic_launcher.png
rename to src/es/hadesnofansub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hadesnofansub/res/mipmap-xhdpi/ic_launcher.png b/src/es/hadesnofansub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hadesnofansub/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/hadesnofansub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hadesnofansub/res/mipmap-xxhdpi/ic_launcher.png b/src/es/hadesnofansub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hadesnofansub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/hadesnofansub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hadesnofansub/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/hadesnofansub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hadesnofansub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/hadesnofansub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hadesnofansub/src/HadesNoFansub.kt b/src/es/hadesnofansub/src/eu/kanade/tachiyomi/extension/es/hadesnofansub/HadesNoFansub.kt
similarity index 100%
rename from multisrc/overrides/madara/hadesnofansub/src/HadesNoFansub.kt
rename to src/es/hadesnofansub/src/eu/kanade/tachiyomi/extension/es/hadesnofansub/HadesNoFansub.kt
diff --git a/src/es/hadesnofansubhentai/build.gradle b/src/es/hadesnofansubhentai/build.gradle
new file mode 100644
index 000000000..5e2e3646e
--- /dev/null
+++ b/src/es/hadesnofansubhentai/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hades no Fansub Hentai'
+ extClass = '.HadesnoFansubHentai'
+ themePkg = 'madara'
+ baseUrl = 'https://h.mangareaderpro.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hadesnofansubhentai/res/mipmap-hdpi/ic_launcher.png b/src/es/hadesnofansubhentai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hadesnofansubhentai/res/mipmap-hdpi/ic_launcher.png
rename to src/es/hadesnofansubhentai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hadesnofansubhentai/res/mipmap-mdpi/ic_launcher.png b/src/es/hadesnofansubhentai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hadesnofansubhentai/res/mipmap-mdpi/ic_launcher.png
rename to src/es/hadesnofansubhentai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hadesnofansubhentai/res/mipmap-xhdpi/ic_launcher.png b/src/es/hadesnofansubhentai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hadesnofansubhentai/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/hadesnofansubhentai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hadesnofansubhentai/res/mipmap-xxhdpi/ic_launcher.png b/src/es/hadesnofansubhentai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hadesnofansubhentai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/hadesnofansubhentai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hadesnofansubhentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/hadesnofansubhentai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hadesnofansubhentai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/hadesnofansubhentai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/es/hadesnofansubhentai/src/eu/kanade/tachiyomi/extension/es/hadesnofansubhentai/HadesnoFansubHentai.kt b/src/es/hadesnofansubhentai/src/eu/kanade/tachiyomi/extension/es/hadesnofansubhentai/HadesnoFansubHentai.kt
new file mode 100644
index 000000000..db13091ad
--- /dev/null
+++ b/src/es/hadesnofansubhentai/src/eu/kanade/tachiyomi/extension/es/hadesnofansubhentai/HadesnoFansubHentai.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.es.hadesnofansubhentai
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class HadesnoFansubHentai : Madara("Hades no Fansub Hentai", "https://h.mangareaderpro.com", "es")
diff --git a/src/es/herenscan/build.gradle b/src/es/herenscan/build.gradle
new file mode 100644
index 000000000..87b989912
--- /dev/null
+++ b/src/es/herenscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'HerenScan'
+ extClass = '.HerenScan'
+ themePkg = 'madara'
+ baseUrl = 'https://herenscan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/herenscan/res/mipmap-hdpi/ic_launcher.png b/src/es/herenscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/herenscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/herenscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/herenscan/res/mipmap-mdpi/ic_launcher.png b/src/es/herenscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/herenscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/herenscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/herenscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/herenscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/herenscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/herenscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/herenscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/herenscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/herenscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/herenscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/herenscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/herenscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/herenscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/herenscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/herenscan/src/HerenScan.kt b/src/es/herenscan/src/eu/kanade/tachiyomi/extension/es/herenscan/HerenScan.kt
similarity index 100%
rename from multisrc/overrides/madara/herenscan/src/HerenScan.kt
rename to src/es/herenscan/src/eu/kanade/tachiyomi/extension/es/herenscan/HerenScan.kt
diff --git a/src/es/housemangas/build.gradle b/src/es/housemangas/build.gradle
new file mode 100644
index 000000000..eb7156be0
--- /dev/null
+++ b/src/es/housemangas/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'HouseMangas'
+ extClass = '.HouseMangas'
+ themePkg = 'madara'
+ baseUrl = 'https://housemangas.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/housemangas/res/mipmap-hdpi/ic_launcher.png b/src/es/housemangas/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/housemangas/res/mipmap-hdpi/ic_launcher.png
rename to src/es/housemangas/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/housemangas/res/mipmap-mdpi/ic_launcher.png b/src/es/housemangas/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/housemangas/res/mipmap-mdpi/ic_launcher.png
rename to src/es/housemangas/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/housemangas/res/mipmap-xhdpi/ic_launcher.png b/src/es/housemangas/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/housemangas/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/housemangas/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/housemangas/res/mipmap-xxhdpi/ic_launcher.png b/src/es/housemangas/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/housemangas/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/housemangas/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/housemangas/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/housemangas/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/housemangas/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/housemangas/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/housemangas/src/HouseMangas.kt b/src/es/housemangas/src/eu/kanade/tachiyomi/extension/es/housemangas/HouseMangas.kt
similarity index 100%
rename from multisrc/overrides/madara/housemangas/src/HouseMangas.kt
rename to src/es/housemangas/src/eu/kanade/tachiyomi/extension/es/housemangas/HouseMangas.kt
diff --git a/src/es/ikifeng/build.gradle b/src/es/ikifeng/build.gradle
new file mode 100644
index 000000000..350db03fd
--- /dev/null
+++ b/src/es/ikifeng/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Lector Online'
+ extClass = '.Ikifeng'
+ themePkg = 'madara'
+ baseUrl = 'https://lectorunm.life'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/ikifeng/res/mipmap-hdpi/ic_launcher.png b/src/es/ikifeng/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ikifeng/res/mipmap-hdpi/ic_launcher.png
rename to src/es/ikifeng/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ikifeng/res/mipmap-mdpi/ic_launcher.png b/src/es/ikifeng/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ikifeng/res/mipmap-mdpi/ic_launcher.png
rename to src/es/ikifeng/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ikifeng/res/mipmap-xhdpi/ic_launcher.png b/src/es/ikifeng/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ikifeng/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/ikifeng/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ikifeng/res/mipmap-xxhdpi/ic_launcher.png b/src/es/ikifeng/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ikifeng/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/ikifeng/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ikifeng/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/ikifeng/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ikifeng/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/ikifeng/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ikifeng/src/Ikifeng.kt b/src/es/ikifeng/src/eu/kanade/tachiyomi/extension/es/ikifeng/Ikifeng.kt
similarity index 100%
rename from multisrc/overrides/madara/ikifeng/src/Ikifeng.kt
rename to src/es/ikifeng/src/eu/kanade/tachiyomi/extension/es/ikifeng/Ikifeng.kt
diff --git a/src/es/inarimanga/build.gradle b/src/es/inarimanga/build.gradle
new file mode 100644
index 000000000..929e966c3
--- /dev/null
+++ b/src/es/inarimanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'InariManga'
+ extClass = '.InariManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://inarimanga.net'
+ overrideVersionCode = 8
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/inarimanga/res/mipmap-hdpi/ic_launcher.png b/src/es/inarimanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/inarimanga/res/mipmap-hdpi/ic_launcher.png
rename to src/es/inarimanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/inarimanga/res/mipmap-mdpi/ic_launcher.png b/src/es/inarimanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/inarimanga/res/mipmap-mdpi/ic_launcher.png
rename to src/es/inarimanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/inarimanga/res/mipmap-xhdpi/ic_launcher.png b/src/es/inarimanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/inarimanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/inarimanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/inarimanga/res/mipmap-xxhdpi/ic_launcher.png b/src/es/inarimanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/inarimanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/inarimanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/inarimanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/inarimanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/inarimanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/inarimanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/inarimanga/src/InariManga.kt b/src/es/inarimanga/src/eu/kanade/tachiyomi/extension/es/inarimanga/InariManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/inarimanga/src/InariManga.kt
rename to src/es/inarimanga/src/eu/kanade/tachiyomi/extension/es/inarimanga/InariManga.kt
diff --git a/src/es/infrafandub/build.gradle b/src/es/infrafandub/build.gradle
new file mode 100644
index 000000000..f260ea556
--- /dev/null
+++ b/src/es/infrafandub/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'InfraFandub'
+ extClass = '.InfraFandub'
+ themePkg = 'madara'
+ baseUrl = 'https://infrafandub.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/infrafandub/res/mipmap-hdpi/ic_launcher.png b/src/es/infrafandub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/infrafandub/res/mipmap-hdpi/ic_launcher.png
rename to src/es/infrafandub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/infrafandub/res/mipmap-mdpi/ic_launcher.png b/src/es/infrafandub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/infrafandub/res/mipmap-mdpi/ic_launcher.png
rename to src/es/infrafandub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/infrafandub/res/mipmap-xhdpi/ic_launcher.png b/src/es/infrafandub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/infrafandub/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/infrafandub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/infrafandub/res/mipmap-xxhdpi/ic_launcher.png b/src/es/infrafandub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/infrafandub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/infrafandub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/infrafandub/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/infrafandub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/infrafandub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/infrafandub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/infrafandub/src/InfraFandub.kt b/src/es/infrafandub/src/eu/kanade/tachiyomi/extension/es/infrafandub/InfraFandub.kt
similarity index 100%
rename from multisrc/overrides/madara/infrafandub/src/InfraFandub.kt
rename to src/es/infrafandub/src/eu/kanade/tachiyomi/extension/es/infrafandub/InfraFandub.kt
diff --git a/src/es/inmortalscan/build.gradle b/src/es/inmortalscan/build.gradle
new file mode 100644
index 000000000..ffb1f6a74
--- /dev/null
+++ b/src/es/inmortalscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Inmortal Scan'
+ extClass = '.InmortalScan'
+ themePkg = 'madara'
+ baseUrl = 'https://manga.mundodrama.site'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/inmortalscan/res/mipmap-hdpi/ic_launcher.png b/src/es/inmortalscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/inmortalscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/inmortalscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/inmortalscan/res/mipmap-mdpi/ic_launcher.png b/src/es/inmortalscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/inmortalscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/inmortalscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/inmortalscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/inmortalscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/inmortalscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/inmortalscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/inmortalscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/inmortalscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/inmortalscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/inmortalscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/inmortalscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/inmortalscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/inmortalscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/inmortalscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/inmortalscan/src/InmortalScan.kt b/src/es/inmortalscan/src/eu/kanade/tachiyomi/extension/es/inmortalscan/InmortalScan.kt
similarity index 100%
rename from multisrc/overrides/madara/inmortalscan/src/InmortalScan.kt
rename to src/es/inmortalscan/src/eu/kanade/tachiyomi/extension/es/inmortalscan/InmortalScan.kt
diff --git a/src/es/kenhuascan/build.gradle b/src/es/kenhuascan/build.gradle
new file mode 100644
index 000000000..46b110173
--- /dev/null
+++ b/src/es/kenhuascan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'KenhuaScan'
+ extClass = '.KenhuaScan'
+ themePkg = 'madara'
+ baseUrl = 'https://kenhuav2scan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/kenhuascan/res/mipmap-hdpi/ic_launcher.png b/src/es/kenhuascan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kenhuascan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/kenhuascan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kenhuascan/res/mipmap-mdpi/ic_launcher.png b/src/es/kenhuascan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kenhuascan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/kenhuascan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kenhuascan/res/mipmap-xhdpi/ic_launcher.png b/src/es/kenhuascan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kenhuascan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/kenhuascan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kenhuascan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/kenhuascan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kenhuascan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/kenhuascan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kenhuascan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/kenhuascan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kenhuascan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/kenhuascan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kenhuascan/src/KenhuaScan.kt b/src/es/kenhuascan/src/eu/kanade/tachiyomi/extension/es/kenhuascan/KenhuaScan.kt
similarity index 100%
rename from multisrc/overrides/madara/kenhuascan/src/KenhuaScan.kt
rename to src/es/kenhuascan/src/eu/kanade/tachiyomi/extension/es/kenhuascan/KenhuaScan.kt
diff --git a/src/es/knightnoscanlation/build.gradle b/src/es/knightnoscanlation/build.gradle
new file mode 100644
index 000000000..d28d4a9bc
--- /dev/null
+++ b/src/es/knightnoscanlation/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Knight No Scanlation'
+ extClass = '.KnightNoScanlation'
+ themePkg = 'madara'
+ baseUrl = 'https://knightnoscanlation.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/knightnoscanlation/res/mipmap-hdpi/ic_launcher.png b/src/es/knightnoscanlation/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/knightnoscanlation/res/mipmap-hdpi/ic_launcher.png
rename to src/es/knightnoscanlation/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/knightnoscanlation/res/mipmap-mdpi/ic_launcher.png b/src/es/knightnoscanlation/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/knightnoscanlation/res/mipmap-mdpi/ic_launcher.png
rename to src/es/knightnoscanlation/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/knightnoscanlation/res/mipmap-xhdpi/ic_launcher.png b/src/es/knightnoscanlation/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/knightnoscanlation/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/knightnoscanlation/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/knightnoscanlation/res/mipmap-xxhdpi/ic_launcher.png b/src/es/knightnoscanlation/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/knightnoscanlation/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/knightnoscanlation/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/knightnoscanlation/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/knightnoscanlation/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/knightnoscanlation/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/knightnoscanlation/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/knightnoscanlation/src/KnightNoScanlation.kt b/src/es/knightnoscanlation/src/eu/kanade/tachiyomi/extension/es/knightnoscanlation/KnightNoScanlation.kt
similarity index 100%
rename from multisrc/overrides/madara/knightnoscanlation/src/KnightNoScanlation.kt
rename to src/es/knightnoscanlation/src/eu/kanade/tachiyomi/extension/es/knightnoscanlation/KnightNoScanlation.kt
diff --git a/src/es/koinoboriscan/build.gradle b/src/es/koinoboriscan/build.gradle
new file mode 100644
index 000000000..413bec684
--- /dev/null
+++ b/src/es/koinoboriscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Koinobori Scan'
+ extClass = '.KoinoboriScan'
+ themePkg = 'madara'
+ baseUrl = 'https://koinoboriscan.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/koinoboriscan/res/mipmap-hdpi/ic_launcher.png b/src/es/koinoboriscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/koinoboriscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/koinoboriscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/koinoboriscan/res/mipmap-mdpi/ic_launcher.png b/src/es/koinoboriscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/koinoboriscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/koinoboriscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/koinoboriscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/koinoboriscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/koinoboriscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/koinoboriscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/koinoboriscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/koinoboriscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/koinoboriscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/koinoboriscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/koinoboriscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/koinoboriscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/koinoboriscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/koinoboriscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/koinoboriscan/src/KoinoboriScan.kt b/src/es/koinoboriscan/src/eu/kanade/tachiyomi/extension/es/koinoboriscan/KoinoboriScan.kt
similarity index 100%
rename from multisrc/overrides/madara/koinoboriscan/src/KoinoboriScan.kt
rename to src/es/koinoboriscan/src/eu/kanade/tachiyomi/extension/es/koinoboriscan/KoinoboriScan.kt
diff --git a/src/es/lectormanga/build.gradle b/src/es/lectormanga/build.gradle
new file mode 100644
index 000000000..132aac23f
--- /dev/null
+++ b/src/es/lectormanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'LectorManga'
+ extClass = '.LectorManga'
+ themePkg = 'lectortmo'
+ baseUrl = 'https://lectormanga.com'
+ overrideVersionCode = 34
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/lectortmo/lectormanga/res/mipmap-hdpi/ic_launcher.png b/src/es/lectormanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/lectortmo/lectormanga/res/mipmap-hdpi/ic_launcher.png
rename to src/es/lectormanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/lectortmo/lectormanga/res/mipmap-mdpi/ic_launcher.png b/src/es/lectormanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/lectortmo/lectormanga/res/mipmap-mdpi/ic_launcher.png
rename to src/es/lectormanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/lectortmo/lectormanga/res/mipmap-xhdpi/ic_launcher.png b/src/es/lectormanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/lectortmo/lectormanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/lectormanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/lectortmo/lectormanga/res/mipmap-xxhdpi/ic_launcher.png b/src/es/lectormanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/lectortmo/lectormanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/lectormanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/lectortmo/lectormanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/lectormanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/lectortmo/lectormanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/lectormanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/lectortmo/lectormanga/src/LectorManga.kt b/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt
similarity index 100%
rename from multisrc/overrides/lectortmo/lectormanga/src/LectorManga.kt
rename to src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt
diff --git a/src/es/lectormangalat/build.gradle b/src/es/lectormangalat/build.gradle
new file mode 100644
index 000000000..07ee0e77e
--- /dev/null
+++ b/src/es/lectormangalat/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'LectorManga.lat'
+ extClass = '.LectorMangaLat'
+ themePkg = 'madara'
+ baseUrl = 'https://www.lectormanga.lat'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/lectormangalat/res/mipmap-hdpi/ic_launcher.png b/src/es/lectormangalat/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lectormangalat/res/mipmap-hdpi/ic_launcher.png
rename to src/es/lectormangalat/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lectormangalat/res/mipmap-mdpi/ic_launcher.png b/src/es/lectormangalat/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lectormangalat/res/mipmap-mdpi/ic_launcher.png
rename to src/es/lectormangalat/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lectormangalat/res/mipmap-xhdpi/ic_launcher.png b/src/es/lectormangalat/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lectormangalat/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/lectormangalat/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lectormangalat/res/mipmap-xxhdpi/ic_launcher.png b/src/es/lectormangalat/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lectormangalat/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/lectormangalat/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lectormangalat/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/lectormangalat/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lectormangalat/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/lectormangalat/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lectormangalat/src/LectorMangaLat.kt b/src/es/lectormangalat/src/eu/kanade/tachiyomi/extension/es/lectormangalat/LectorMangaLat.kt
similarity index 100%
rename from multisrc/overrides/madara/lectormangalat/src/LectorMangaLat.kt
rename to src/es/lectormangalat/src/eu/kanade/tachiyomi/extension/es/lectormangalat/LectorMangaLat.kt
diff --git a/src/es/lkscanlation/build.gradle b/src/es/lkscanlation/build.gradle
new file mode 100644
index 000000000..2e45f12e2
--- /dev/null
+++ b/src/es/lkscanlation/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Last Knight Translation'
+ extClass = '.LKScanlation'
+ themePkg = 'madara'
+ baseUrl = 'https://lkscanlation.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/lkscanlation/res/mipmap-hdpi/ic_launcher.png b/src/es/lkscanlation/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lkscanlation/res/mipmap-hdpi/ic_launcher.png
rename to src/es/lkscanlation/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lkscanlation/res/mipmap-mdpi/ic_launcher.png b/src/es/lkscanlation/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lkscanlation/res/mipmap-mdpi/ic_launcher.png
rename to src/es/lkscanlation/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lkscanlation/res/mipmap-xhdpi/ic_launcher.png b/src/es/lkscanlation/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lkscanlation/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/lkscanlation/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lkscanlation/res/mipmap-xxhdpi/ic_launcher.png b/src/es/lkscanlation/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lkscanlation/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/lkscanlation/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lkscanlation/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/lkscanlation/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/lkscanlation/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/lkscanlation/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/lkscanlation/src/LKScanlation.kt b/src/es/lkscanlation/src/eu/kanade/tachiyomi/extension/es/lkscanlation/LKScanlation.kt
similarity index 100%
rename from multisrc/overrides/madara/lkscanlation/src/LKScanlation.kt
rename to src/es/lkscanlation/src/eu/kanade/tachiyomi/extension/es/lkscanlation/LKScanlation.kt
diff --git a/src/es/mangacrab/build.gradle b/src/es/mangacrab/build.gradle
new file mode 100644
index 000000000..1e156e8da
--- /dev/null
+++ b/src/es/mangacrab/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Crab'
+ extClass = '.MangaCrab'
+ themePkg = 'madara'
+ baseUrl = 'https://mangacrab3.com'
+ overrideVersionCode = 7
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangacrab/res/mipmap-hdpi/ic_launcher.png b/src/es/mangacrab/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacrab/res/mipmap-hdpi/ic_launcher.png
rename to src/es/mangacrab/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacrab/res/mipmap-mdpi/ic_launcher.png b/src/es/mangacrab/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacrab/res/mipmap-mdpi/ic_launcher.png
rename to src/es/mangacrab/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacrab/res/mipmap-xhdpi/ic_launcher.png b/src/es/mangacrab/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacrab/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/mangacrab/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacrab/res/mipmap-xxhdpi/ic_launcher.png b/src/es/mangacrab/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacrab/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/mangacrab/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacrab/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/mangacrab/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangacrab/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/mangacrab/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangacrab/src/MangaCrab.kt b/src/es/mangacrab/src/eu/kanade/tachiyomi/extension/es/mangacrab/MangaCrab.kt
similarity index 100%
rename from multisrc/overrides/madara/mangacrab/src/MangaCrab.kt
rename to src/es/mangacrab/src/eu/kanade/tachiyomi/extension/es/mangacrab/MangaCrab.kt
diff --git a/src/es/mangadoor/build.gradle b/src/es/mangadoor/build.gradle
new file mode 100644
index 000000000..43dbc115d
--- /dev/null
+++ b/src/es/mangadoor/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Mangadoor'
+ extClass = '.Mangadoor'
+ themePkg = 'mmrcms'
+ baseUrl = 'https://mangadoor.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mmrcms/mangadoor/res/mipmap-hdpi/ic_launcher.png b/src/es/mangadoor/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangadoor/res/mipmap-hdpi/ic_launcher.png
rename to src/es/mangadoor/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangadoor/res/mipmap-mdpi/ic_launcher.png b/src/es/mangadoor/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangadoor/res/mipmap-mdpi/ic_launcher.png
rename to src/es/mangadoor/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangadoor/res/mipmap-xhdpi/ic_launcher.png b/src/es/mangadoor/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangadoor/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/mangadoor/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangadoor/res/mipmap-xxhdpi/ic_launcher.png b/src/es/mangadoor/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangadoor/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/mangadoor/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangadoor/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/mangadoor/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangadoor/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/mangadoor/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/es/mangadoor/src/eu/kanade/tachiyomi/extension/es/mangadoor/Mangadoor.kt b/src/es/mangadoor/src/eu/kanade/tachiyomi/extension/es/mangadoor/Mangadoor.kt
new file mode 100644
index 000000000..a5de157de
--- /dev/null
+++ b/src/es/mangadoor/src/eu/kanade/tachiyomi/extension/es/mangadoor/Mangadoor.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.es.mangadoor
+
+import eu.kanade.tachiyomi.multisrc.mmrcms.MMRCMS
+
+class Mangadoor : MMRCMS("Mangadoor", "https://mangadoor.com", "es")
diff --git a/src/es/mangafenix/build.gradle b/src/es/mangafenix/build.gradle
new file mode 100644
index 000000000..0546093ee
--- /dev/null
+++ b/src/es/mangafenix/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manhua Fenix'
+ extClass = '.ManhuaFenix'
+ themePkg = 'madara'
+ baseUrl = 'https://visorfenix.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangafenix/res/mipmap-hdpi/ic_launcher.png b/src/es/mangafenix/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafenix/res/mipmap-hdpi/ic_launcher.png
rename to src/es/mangafenix/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafenix/res/mipmap-mdpi/ic_launcher.png b/src/es/mangafenix/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafenix/res/mipmap-mdpi/ic_launcher.png
rename to src/es/mangafenix/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafenix/res/mipmap-xhdpi/ic_launcher.png b/src/es/mangafenix/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafenix/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/mangafenix/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafenix/res/mipmap-xxhdpi/ic_launcher.png b/src/es/mangafenix/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafenix/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/mangafenix/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafenix/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/mangafenix/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangafenix/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/mangafenix/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangafenix/src/ManhuaFenix.kt b/src/es/mangafenix/src/eu/kanade/tachiyomi/extension/es/mangafenix/ManhuaFenix.kt
similarity index 100%
rename from multisrc/overrides/madara/mangafenix/src/ManhuaFenix.kt
rename to src/es/mangafenix/src/eu/kanade/tachiyomi/extension/es/mangafenix/ManhuaFenix.kt
diff --git a/src/es/mangaland/build.gradle b/src/es/mangaland/build.gradle
new file mode 100644
index 000000000..f11eb8f71
--- /dev/null
+++ b/src/es/mangaland/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Mangaland'
+ extClass = '.Mangaland'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaland.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaland/res/mipmap-hdpi/ic_launcher.png b/src/es/mangaland/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaland/res/mipmap-hdpi/ic_launcher.png
rename to src/es/mangaland/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaland/res/mipmap-mdpi/ic_launcher.png b/src/es/mangaland/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaland/res/mipmap-mdpi/ic_launcher.png
rename to src/es/mangaland/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaland/res/mipmap-xhdpi/ic_launcher.png b/src/es/mangaland/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaland/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/mangaland/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaland/res/mipmap-xxhdpi/ic_launcher.png b/src/es/mangaland/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaland/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/mangaland/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaland/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/mangaland/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaland/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/mangaland/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaland/src/Mangaland.kt b/src/es/mangaland/src/eu/kanade/tachiyomi/extension/es/mangaland/Mangaland.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaland/src/Mangaland.kt
rename to src/es/mangaland/src/eu/kanade/tachiyomi/extension/es/mangaland/Mangaland.kt
diff --git a/src/es/mangapt/build.gradle b/src/es/mangapt/build.gradle
new file mode 100644
index 000000000..e9b82ca70
--- /dev/null
+++ b/src/es/mangapt/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaPT'
+ extClass = '.MangaPT'
+ themePkg = 'madara'
+ baseUrl = 'https://mangapt.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangapt/res/mipmap-hdpi/ic_launcher.png b/src/es/mangapt/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangapt/res/mipmap-hdpi/ic_launcher.png
rename to src/es/mangapt/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangapt/res/mipmap-mdpi/ic_launcher.png b/src/es/mangapt/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangapt/res/mipmap-mdpi/ic_launcher.png
rename to src/es/mangapt/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangapt/res/mipmap-xhdpi/ic_launcher.png b/src/es/mangapt/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangapt/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/mangapt/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangapt/res/mipmap-xxhdpi/ic_launcher.png b/src/es/mangapt/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangapt/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/mangapt/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangapt/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/mangapt/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangapt/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/mangapt/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangapt/src/MangaPT.kt b/src/es/mangapt/src/eu/kanade/tachiyomi/extension/es/mangapt/MangaPT.kt
similarity index 100%
rename from multisrc/overrides/madara/mangapt/src/MangaPT.kt
rename to src/es/mangapt/src/eu/kanade/tachiyomi/extension/es/mangapt/MangaPT.kt
diff --git a/src/es/mangashiina/build.gradle b/src/es/mangashiina/build.gradle
new file mode 100644
index 000000000..783bbf0d3
--- /dev/null
+++ b/src/es/mangashiina/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaShiina'
+ extClass = '.MangaShiina'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangashiina.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangashiina/res/mipmap-hdpi/ic_launcher.png b/src/es/mangashiina/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangashiina/res/mipmap-hdpi/ic_launcher.png
rename to src/es/mangashiina/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangashiina/res/mipmap-mdpi/ic_launcher.png b/src/es/mangashiina/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangashiina/res/mipmap-mdpi/ic_launcher.png
rename to src/es/mangashiina/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangashiina/res/mipmap-xhdpi/ic_launcher.png b/src/es/mangashiina/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangashiina/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/mangashiina/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangashiina/res/mipmap-xxhdpi/ic_launcher.png b/src/es/mangashiina/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangashiina/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/mangashiina/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangashiina/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/mangashiina/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangashiina/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/mangashiina/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangashiina/src/MangaShiina.kt b/src/es/mangashiina/src/eu/kanade/tachiyomi/extension/es/mangashiina/MangaShiina.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangashiina/src/MangaShiina.kt
rename to src/es/mangashiina/src/eu/kanade/tachiyomi/extension/es/mangashiina/MangaShiina.kt
diff --git a/src/es/mangasin/build.gradle b/src/es/mangasin/build.gradle
new file mode 100644
index 000000000..f53195152
--- /dev/null
+++ b/src/es/mangasin/build.gradle
@@ -0,0 +1,15 @@
+ext {
+ extName = 'Mangas.in'
+ extClass = '.MangasIn'
+ themePkg = 'mmrcms'
+ baseUrl = 'https://mangas.in'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+ implementation(project(":lib:synchrony"))
+ implementation(project(":lib:cryptoaes"))
+}
diff --git a/multisrc/overrides/mmrcms/mangasin/res/mipmap-hdpi/ic_launcher.png b/src/es/mangasin/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangasin/res/mipmap-hdpi/ic_launcher.png
rename to src/es/mangasin/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangasin/res/mipmap-mdpi/ic_launcher.png b/src/es/mangasin/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangasin/res/mipmap-mdpi/ic_launcher.png
rename to src/es/mangasin/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangasin/res/mipmap-xhdpi/ic_launcher.png b/src/es/mangasin/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangasin/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/mangasin/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangasin/res/mipmap-xxhdpi/ic_launcher.png b/src/es/mangasin/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangasin/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/mangasin/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangasin/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/mangasin/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangasin/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/mangasin/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangasin/src/MangasIn.kt b/src/es/mangasin/src/eu/kanade/tachiyomi/extension/es/mangasin/MangasIn.kt
similarity index 100%
rename from multisrc/overrides/mmrcms/mangasin/src/MangasIn.kt
rename to src/es/mangasin/src/eu/kanade/tachiyomi/extension/es/mangasin/MangasIn.kt
diff --git a/multisrc/overrides/mmrcms/mangasin/src/MangasInDto.kt b/src/es/mangasin/src/eu/kanade/tachiyomi/extension/es/mangasin/MangasInDto.kt
similarity index 100%
rename from multisrc/overrides/mmrcms/mangasin/src/MangasInDto.kt
rename to src/es/mangasin/src/eu/kanade/tachiyomi/extension/es/mangasin/MangasInDto.kt
diff --git a/src/es/mangasnosekai/build.gradle b/src/es/mangasnosekai/build.gradle
new file mode 100644
index 000000000..63d3212cb
--- /dev/null
+++ b/src/es/mangasnosekai/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangas No Sekai'
+ extClass = '.MangasNoSekai'
+ themePkg = 'madara'
+ baseUrl = 'https://mangasnosekai.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangasnosekai/res/mipmap-hdpi/ic_launcher.png b/src/es/mangasnosekai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasnosekai/res/mipmap-hdpi/ic_launcher.png
rename to src/es/mangasnosekai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasnosekai/res/mipmap-mdpi/ic_launcher.png b/src/es/mangasnosekai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasnosekai/res/mipmap-mdpi/ic_launcher.png
rename to src/es/mangasnosekai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasnosekai/res/mipmap-xhdpi/ic_launcher.png b/src/es/mangasnosekai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasnosekai/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/mangasnosekai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasnosekai/res/mipmap-xxhdpi/ic_launcher.png b/src/es/mangasnosekai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasnosekai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/mangasnosekai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasnosekai/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/mangasnosekai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasnosekai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/mangasnosekai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasnosekai/src/MangasNoSekai.kt b/src/es/mangasnosekai/src/eu/kanade/tachiyomi/extension/es/mangasnosekai/MangasNoSekai.kt
similarity index 100%
rename from multisrc/overrides/madara/mangasnosekai/src/MangasNoSekai.kt
rename to src/es/mangasnosekai/src/eu/kanade/tachiyomi/extension/es/mangasnosekai/MangasNoSekai.kt
diff --git a/src/es/mangaxico/build.gradle b/src/es/mangaxico/build.gradle
new file mode 100644
index 000000000..bc63730b3
--- /dev/null
+++ b/src/es/mangaxico/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Mangaxico'
+ extClass = '.Mangaxico'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaxico.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaxico/res/mipmap-hdpi/ic_launcher.png b/src/es/mangaxico/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaxico/res/mipmap-hdpi/ic_launcher.png
rename to src/es/mangaxico/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaxico/res/mipmap-mdpi/ic_launcher.png b/src/es/mangaxico/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaxico/res/mipmap-mdpi/ic_launcher.png
rename to src/es/mangaxico/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaxico/res/mipmap-xhdpi/ic_launcher.png b/src/es/mangaxico/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaxico/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/mangaxico/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaxico/res/mipmap-xxhdpi/ic_launcher.png b/src/es/mangaxico/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaxico/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/mangaxico/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaxico/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/mangaxico/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaxico/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/mangaxico/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaxico/src/Mangaxico.kt b/src/es/mangaxico/src/eu/kanade/tachiyomi/extension/es/mangaxico/Mangaxico.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaxico/src/Mangaxico.kt
rename to src/es/mangaxico/src/eu/kanade/tachiyomi/extension/es/mangaxico/Mangaxico.kt
diff --git a/src/es/manhwalatino/build.gradle b/src/es/manhwalatino/build.gradle
new file mode 100644
index 000000000..0270d0933
--- /dev/null
+++ b/src/es/manhwalatino/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwa-Latino'
+ extClass = '.ManhwaLatino'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwa-latino.com'
+ overrideVersionCode = 7
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwalatino/res/mipmap-hdpi/ic_launcher.png b/src/es/manhwalatino/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwalatino/res/mipmap-hdpi/ic_launcher.png
rename to src/es/manhwalatino/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwalatino/res/mipmap-mdpi/ic_launcher.png b/src/es/manhwalatino/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwalatino/res/mipmap-mdpi/ic_launcher.png
rename to src/es/manhwalatino/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwalatino/res/mipmap-xhdpi/ic_launcher.png b/src/es/manhwalatino/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwalatino/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/manhwalatino/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwalatino/res/mipmap-xxhdpi/ic_launcher.png b/src/es/manhwalatino/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwalatino/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/manhwalatino/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwalatino/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/manhwalatino/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwalatino/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/manhwalatino/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwalatino/src/ManhwaLatino.kt b/src/es/manhwalatino/src/eu/kanade/tachiyomi/extension/es/manhwalatino/ManhwaLatino.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwalatino/src/ManhwaLatino.kt
rename to src/es/manhwalatino/src/eu/kanade/tachiyomi/extension/es/manhwalatino/ManhwaLatino.kt
diff --git a/src/es/mantrazscan/build.gradle b/src/es/mantrazscan/build.gradle
new file mode 100644
index 000000000..925d44670
--- /dev/null
+++ b/src/es/mantrazscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mantraz Scan'
+ extClass = '.MantrazScan'
+ themePkg = 'madara'
+ baseUrl = 'https://mantrazscan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mantrazscan/res/mipmap-hdpi/ic_launcher.png b/src/es/mantrazscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mantrazscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/mantrazscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mantrazscan/res/mipmap-mdpi/ic_launcher.png b/src/es/mantrazscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mantrazscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/mantrazscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mantrazscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/mantrazscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mantrazscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/mantrazscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mantrazscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/mantrazscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mantrazscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/mantrazscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mantrazscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/mantrazscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mantrazscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/mantrazscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mantrazscan/src/MantrazScan.kt b/src/es/mantrazscan/src/eu/kanade/tachiyomi/extension/es/mantrazscan/MantrazScan.kt
similarity index 100%
rename from multisrc/overrides/madara/mantrazscan/src/MantrazScan.kt
rename to src/es/mantrazscan/src/eu/kanade/tachiyomi/extension/es/mantrazscan/MantrazScan.kt
diff --git a/src/es/menudofansub/build.gradle b/src/es/menudofansub/build.gradle
new file mode 100644
index 000000000..76dd7bba3
--- /dev/null
+++ b/src/es/menudofansub/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Menudo-Fansub'
+ extClass = '.MenudoFansub'
+ themePkg = 'foolslide'
+ baseUrl = 'https://www.menudo-fansub.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/foolslide/menudofansub/res/mipmap-hdpi/ic_launcher.png b/src/es/menudofansub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/menudofansub/res/mipmap-hdpi/ic_launcher.png
rename to src/es/menudofansub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/menudofansub/res/mipmap-mdpi/ic_launcher.png b/src/es/menudofansub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/menudofansub/res/mipmap-mdpi/ic_launcher.png
rename to src/es/menudofansub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/menudofansub/res/mipmap-xhdpi/ic_launcher.png b/src/es/menudofansub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/menudofansub/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/menudofansub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/menudofansub/res/mipmap-xxhdpi/ic_launcher.png b/src/es/menudofansub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/menudofansub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/menudofansub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/menudofansub/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/menudofansub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/menudofansub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/menudofansub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/menudofansub/src/MenudoFansub.kt b/src/es/menudofansub/src/eu/kanade/tachiyomi/extension/es/menudofansub/MenudoFansub.kt
similarity index 100%
rename from multisrc/overrides/foolslide/menudofansub/src/MenudoFansub.kt
rename to src/es/menudofansub/src/eu/kanade/tachiyomi/extension/es/menudofansub/MenudoFansub.kt
diff --git a/src/es/mhscans/build.gradle b/src/es/mhscans/build.gradle
new file mode 100644
index 000000000..cd0cb49a9
--- /dev/null
+++ b/src/es/mhscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MHScans'
+ extClass = '.MHScans'
+ themePkg = 'madara'
+ baseUrl = 'https://mhscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mhscans/res/mipmap-hdpi/ic_launcher.png b/src/es/mhscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mhscans/res/mipmap-hdpi/ic_launcher.png
rename to src/es/mhscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mhscans/res/mipmap-mdpi/ic_launcher.png b/src/es/mhscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mhscans/res/mipmap-mdpi/ic_launcher.png
rename to src/es/mhscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mhscans/res/mipmap-xhdpi/ic_launcher.png b/src/es/mhscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mhscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/mhscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mhscans/res/mipmap-xxhdpi/ic_launcher.png b/src/es/mhscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mhscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/mhscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mhscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/mhscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mhscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/mhscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mhscans/src/MHScans.kt b/src/es/mhscans/src/eu/kanade/tachiyomi/extension/es/mhscans/MHScans.kt
similarity index 100%
rename from multisrc/overrides/madara/mhscans/src/MHScans.kt
rename to src/es/mhscans/src/eu/kanade/tachiyomi/extension/es/mhscans/MHScans.kt
diff --git a/src/es/midnightmanga/build.gradle b/src/es/midnightmanga/build.gradle
new file mode 100644
index 000000000..08bd5cc6f
--- /dev/null
+++ b/src/es/midnightmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MidnightManga'
+ extClass = '.MidnightManga'
+ themePkg = 'madara'
+ baseUrl = 'http://midnightmanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/midnightmanga/res/mipmap-hdpi/ic_launcher.png b/src/es/midnightmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/midnightmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/es/midnightmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/midnightmanga/res/mipmap-mdpi/ic_launcher.png b/src/es/midnightmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/midnightmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/es/midnightmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/midnightmanga/res/mipmap-xhdpi/ic_launcher.png b/src/es/midnightmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/midnightmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/midnightmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/midnightmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/es/midnightmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/midnightmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/midnightmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/midnightmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/midnightmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/midnightmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/midnightmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/midnightmanga/src/MidnightManga.kt b/src/es/midnightmanga/src/eu/kanade/tachiyomi/extension/es/midnightmanga/MidnightManga.kt
similarity index 100%
rename from multisrc/overrides/madara/midnightmanga/src/MidnightManga.kt
rename to src/es/midnightmanga/src/eu/kanade/tachiyomi/extension/es/midnightmanga/MidnightManga.kt
diff --git a/src/es/monarcamanga/build.gradle b/src/es/monarcamanga/build.gradle
new file mode 100644
index 000000000..32fa7353e
--- /dev/null
+++ b/src/es/monarcamanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MonarcaManga'
+ extClass = '.MonarcaManga'
+ themePkg = 'madara'
+ baseUrl = 'https://monarcamanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/monarcamanga/res/mipmap-hdpi/ic_launcher.png b/src/es/monarcamanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/monarcamanga/res/mipmap-hdpi/ic_launcher.png
rename to src/es/monarcamanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/monarcamanga/res/mipmap-mdpi/ic_launcher.png b/src/es/monarcamanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/monarcamanga/res/mipmap-mdpi/ic_launcher.png
rename to src/es/monarcamanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/monarcamanga/res/mipmap-xhdpi/ic_launcher.png b/src/es/monarcamanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/monarcamanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/monarcamanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/monarcamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/es/monarcamanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/monarcamanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/monarcamanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/monarcamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/monarcamanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/monarcamanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/monarcamanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/monarcamanga/src/MonarcaManga.kt b/src/es/monarcamanga/src/eu/kanade/tachiyomi/extension/es/monarcamanga/MonarcaManga.kt
similarity index 100%
rename from multisrc/overrides/madara/monarcamanga/src/MonarcaManga.kt
rename to src/es/monarcamanga/src/eu/kanade/tachiyomi/extension/es/monarcamanga/MonarcaManga.kt
diff --git a/src/es/nekoscans/build.gradle b/src/es/nekoscans/build.gradle
new file mode 100644
index 000000000..97aa8ee9f
--- /dev/null
+++ b/src/es/nekoscans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'NekoScans'
+ extClass = '.NekoScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://nekoscans.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/nekoscans/res/mipmap-hdpi/ic_launcher.png b/src/es/nekoscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nekoscans/res/mipmap-hdpi/ic_launcher.png
rename to src/es/nekoscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nekoscans/res/mipmap-mdpi/ic_launcher.png b/src/es/nekoscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nekoscans/res/mipmap-mdpi/ic_launcher.png
rename to src/es/nekoscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nekoscans/res/mipmap-xhdpi/ic_launcher.png b/src/es/nekoscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nekoscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/nekoscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nekoscans/res/mipmap-xxhdpi/ic_launcher.png b/src/es/nekoscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nekoscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/nekoscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nekoscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/nekoscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nekoscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/nekoscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nekoscans/src/NekoScans.kt b/src/es/nekoscans/src/eu/kanade/tachiyomi/extension/es/nekoscans/NekoScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/nekoscans/src/NekoScans.kt
rename to src/es/nekoscans/src/eu/kanade/tachiyomi/extension/es/nekoscans/NekoScans.kt
diff --git a/src/es/noblessetranslations/build.gradle b/src/es/noblessetranslations/build.gradle
new file mode 100644
index 000000000..db233eab6
--- /dev/null
+++ b/src/es/noblessetranslations/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Noblesse Translations'
+ extClass = '.NoblesseTranslations'
+ themePkg = 'madara'
+ baseUrl = 'https://www.noblessev1.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/noblessetranslations/res/mipmap-hdpi/ic_launcher.png b/src/es/noblessetranslations/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/noblessetranslations/res/mipmap-hdpi/ic_launcher.png
rename to src/es/noblessetranslations/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/noblessetranslations/res/mipmap-mdpi/ic_launcher.png b/src/es/noblessetranslations/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/noblessetranslations/res/mipmap-mdpi/ic_launcher.png
rename to src/es/noblessetranslations/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/noblessetranslations/res/mipmap-xhdpi/ic_launcher.png b/src/es/noblessetranslations/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/noblessetranslations/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/noblessetranslations/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/noblessetranslations/res/mipmap-xxhdpi/ic_launcher.png b/src/es/noblessetranslations/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/noblessetranslations/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/noblessetranslations/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/noblessetranslations/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/noblessetranslations/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/noblessetranslations/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/noblessetranslations/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/noblessetranslations/src/NoblesseTranslations.kt b/src/es/noblessetranslations/src/eu/kanade/tachiyomi/extension/es/noblessetranslations/NoblesseTranslations.kt
similarity index 100%
rename from multisrc/overrides/madara/noblessetranslations/src/NoblesseTranslations.kt
rename to src/es/noblessetranslations/src/eu/kanade/tachiyomi/extension/es/noblessetranslations/NoblesseTranslations.kt
diff --git a/src/es/ragnarokscan/build.gradle b/src/es/ragnarokscan/build.gradle
new file mode 100644
index 000000000..d85a3a00a
--- /dev/null
+++ b/src/es/ragnarokscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'RagnarokScan'
+ extClass = '.RagnarokScan'
+ themePkg = 'madara'
+ baseUrl = 'https://ragnarokscan.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/ragnarokscan/res/mipmap-hdpi/ic_launcher.png b/src/es/ragnarokscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ragnarokscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/ragnarokscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ragnarokscan/res/mipmap-mdpi/ic_launcher.png b/src/es/ragnarokscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ragnarokscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/ragnarokscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ragnarokscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/ragnarokscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ragnarokscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/ragnarokscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ragnarokscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/ragnarokscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ragnarokscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/ragnarokscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ragnarokscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/ragnarokscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ragnarokscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/ragnarokscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ragnarokscan/src/RagnarokScan.kt b/src/es/ragnarokscan/src/eu/kanade/tachiyomi/extension/es/ragnarokscan/RagnarokScan.kt
similarity index 100%
rename from multisrc/overrides/madara/ragnarokscan/src/RagnarokScan.kt
rename to src/es/ragnarokscan/src/eu/kanade/tachiyomi/extension/es/ragnarokscan/RagnarokScan.kt
diff --git a/src/es/ragnarokscanlation/build.gradle b/src/es/ragnarokscanlation/build.gradle
new file mode 100644
index 000000000..379d78cdc
--- /dev/null
+++ b/src/es/ragnarokscanlation/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Ragnarok Scanlation'
+ extClass = '.RagnarokScanlation'
+ themePkg = 'madara'
+ baseUrl = 'https://ragnarokscanlation.net'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/ragnarokscanlation/res/mipmap-hdpi/ic_launcher.png b/src/es/ragnarokscanlation/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ragnarokscanlation/res/mipmap-hdpi/ic_launcher.png
rename to src/es/ragnarokscanlation/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ragnarokscanlation/res/mipmap-mdpi/ic_launcher.png b/src/es/ragnarokscanlation/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ragnarokscanlation/res/mipmap-mdpi/ic_launcher.png
rename to src/es/ragnarokscanlation/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ragnarokscanlation/res/mipmap-xhdpi/ic_launcher.png b/src/es/ragnarokscanlation/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ragnarokscanlation/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/ragnarokscanlation/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ragnarokscanlation/res/mipmap-xxhdpi/ic_launcher.png b/src/es/ragnarokscanlation/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ragnarokscanlation/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/ragnarokscanlation/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ragnarokscanlation/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/ragnarokscanlation/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ragnarokscanlation/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/ragnarokscanlation/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ragnarokscanlation/src/RagnarokScanlation.kt b/src/es/ragnarokscanlation/src/eu/kanade/tachiyomi/extension/es/ragnarokscanlation/RagnarokScanlation.kt
similarity index 100%
rename from multisrc/overrides/madara/ragnarokscanlation/src/RagnarokScanlation.kt
rename to src/es/ragnarokscanlation/src/eu/kanade/tachiyomi/extension/es/ragnarokscanlation/RagnarokScanlation.kt
diff --git a/src/es/raikiscan/build.gradle b/src/es/raikiscan/build.gradle
new file mode 100644
index 000000000..a407a58fe
--- /dev/null
+++ b/src/es/raikiscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Raiki Scan'
+ extClass = '.RaikiScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://raikiscan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/raikiscan/res/mipmap-hdpi/ic_launcher.png b/src/es/raikiscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/raikiscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/raikiscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/raikiscan/res/mipmap-mdpi/ic_launcher.png b/src/es/raikiscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/raikiscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/raikiscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/raikiscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/raikiscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/raikiscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/raikiscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/raikiscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/raikiscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/raikiscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/raikiscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/raikiscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/raikiscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/raikiscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/raikiscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/raikiscan/src/RaikiScan.kt b/src/es/raikiscan/src/eu/kanade/tachiyomi/extension/es/raikiscan/RaikiScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/raikiscan/src/RaikiScan.kt
rename to src/es/raikiscan/src/eu/kanade/tachiyomi/extension/es/raikiscan/RaikiScan.kt
diff --git a/src/es/richtoscan/build.gradle b/src/es/richtoscan/build.gradle
new file mode 100644
index 000000000..34a006188
--- /dev/null
+++ b/src/es/richtoscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'RichtoScan'
+ extClass = '.RichtoScan'
+ themePkg = 'madara'
+ baseUrl = 'https://richtoscan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/richtoscan/src/RichtoScan.kt b/src/es/richtoscan/src/eu/kanade/tachiyomi/extension/es/richtoscan/RichtoScan.kt
similarity index 100%
rename from multisrc/overrides/madara/richtoscan/src/RichtoScan.kt
rename to src/es/richtoscan/src/eu/kanade/tachiyomi/extension/es/richtoscan/RichtoScan.kt
diff --git a/src/es/rightdarkscan/build.gradle b/src/es/rightdarkscan/build.gradle
new file mode 100644
index 000000000..cea329ba0
--- /dev/null
+++ b/src/es/rightdarkscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Rightdark Scan'
+ extClass = '.RightdarkScan'
+ themePkg = 'madara'
+ baseUrl = 'https://rightdark-scan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/rightdarkscan/res/mipmap-hdpi/ic_launcher.png b/src/es/rightdarkscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rightdarkscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/rightdarkscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rightdarkscan/res/mipmap-mdpi/ic_launcher.png b/src/es/rightdarkscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rightdarkscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/rightdarkscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rightdarkscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/rightdarkscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rightdarkscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/rightdarkscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rightdarkscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/rightdarkscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rightdarkscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/rightdarkscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rightdarkscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/rightdarkscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rightdarkscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/rightdarkscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rightdarkscan/src/RightdarkScan.kt b/src/es/rightdarkscan/src/eu/kanade/tachiyomi/extension/es/rightdarkscan/RightdarkScan.kt
similarity index 100%
rename from multisrc/overrides/madara/rightdarkscan/src/RightdarkScan.kt
rename to src/es/rightdarkscan/src/eu/kanade/tachiyomi/extension/es/rightdarkscan/RightdarkScan.kt
diff --git a/src/es/samuraiscan/build.gradle b/src/es/samuraiscan/build.gradle
new file mode 100644
index 000000000..9d13a68ea
--- /dev/null
+++ b/src/es/samuraiscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'SamuraiScan'
+ extClass = '.SamuraiScan'
+ themePkg = 'madara'
+ baseUrl = 'https://samuraiscan.org'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/samuraiscan/res/mipmap-hdpi/ic_launcher.png b/src/es/samuraiscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/samuraiscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/samuraiscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/samuraiscan/res/mipmap-mdpi/ic_launcher.png b/src/es/samuraiscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/samuraiscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/samuraiscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/samuraiscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/samuraiscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/samuraiscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/samuraiscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/samuraiscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/samuraiscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/samuraiscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/samuraiscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/samuraiscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/samuraiscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/samuraiscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/samuraiscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/samuraiscan/src/SamuraiScan.kt b/src/es/samuraiscan/src/eu/kanade/tachiyomi/extension/es/samuraiscan/SamuraiScan.kt
similarity index 100%
rename from multisrc/overrides/madara/samuraiscan/src/SamuraiScan.kt
rename to src/es/samuraiscan/src/eu/kanade/tachiyomi/extension/es/samuraiscan/SamuraiScan.kt
diff --git a/src/es/scambertraslator/build.gradle b/src/es/scambertraslator/build.gradle
new file mode 100644
index 000000000..e7f1aca3c
--- /dev/null
+++ b/src/es/scambertraslator/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ScamberTraslator'
+ extClass = '.ScamberTraslator'
+ themePkg = 'madara'
+ baseUrl = 'https://scambertraslator.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/scambertraslator/res/mipmap-hdpi/ic_launcher.png b/src/es/scambertraslator/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scambertraslator/res/mipmap-hdpi/ic_launcher.png
rename to src/es/scambertraslator/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scambertraslator/res/mipmap-mdpi/ic_launcher.png b/src/es/scambertraslator/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scambertraslator/res/mipmap-mdpi/ic_launcher.png
rename to src/es/scambertraslator/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scambertraslator/res/mipmap-xhdpi/ic_launcher.png b/src/es/scambertraslator/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scambertraslator/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/scambertraslator/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scambertraslator/res/mipmap-xxhdpi/ic_launcher.png b/src/es/scambertraslator/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scambertraslator/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/scambertraslator/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scambertraslator/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/scambertraslator/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scambertraslator/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/scambertraslator/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scambertraslator/src/ScamberTraslator.kt b/src/es/scambertraslator/src/eu/kanade/tachiyomi/extension/es/scambertraslator/ScamberTraslator.kt
similarity index 100%
rename from multisrc/overrides/madara/scambertraslator/src/ScamberTraslator.kt
rename to src/es/scambertraslator/src/eu/kanade/tachiyomi/extension/es/scambertraslator/ScamberTraslator.kt
diff --git a/src/es/sdlscans/build.gradle b/src/es/sdlscans/build.gradle
new file mode 100644
index 000000000..946c36a51
--- /dev/null
+++ b/src/es/sdlscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sdl scans'
+ extClass = '.SdlScans'
+ themePkg = 'madara'
+ baseUrl = 'https://sdlscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/sdlscans/res/mipmap-hdpi/ic_launcher.png b/src/es/sdlscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sdlscans/res/mipmap-hdpi/ic_launcher.png
rename to src/es/sdlscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sdlscans/res/mipmap-mdpi/ic_launcher.png b/src/es/sdlscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sdlscans/res/mipmap-mdpi/ic_launcher.png
rename to src/es/sdlscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sdlscans/res/mipmap-xhdpi/ic_launcher.png b/src/es/sdlscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sdlscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/sdlscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sdlscans/res/mipmap-xxhdpi/ic_launcher.png b/src/es/sdlscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sdlscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/sdlscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sdlscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/sdlscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sdlscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/sdlscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sdlscans/src/SdlScans.kt b/src/es/sdlscans/src/eu/kanade/tachiyomi/extension/es/sdlscans/SdlScans.kt
similarity index 100%
rename from multisrc/overrides/madara/sdlscans/src/SdlScans.kt
rename to src/es/sdlscans/src/eu/kanade/tachiyomi/extension/es/sdlscans/SdlScans.kt
diff --git a/src/es/senpaiediciones/build.gradle b/src/es/senpaiediciones/build.gradle
new file mode 100644
index 000000000..6f76c8ea3
--- /dev/null
+++ b/src/es/senpaiediciones/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Senpai Ediciones'
+ extClass = '.SenpaiEdiciones'
+ themePkg = 'mangathemesia'
+ baseUrl = 'http://senpaiediciones.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/senpaiediciones/res/mipmap-hdpi/ic_launcher.png b/src/es/senpaiediciones/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/senpaiediciones/res/mipmap-hdpi/ic_launcher.png
rename to src/es/senpaiediciones/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/senpaiediciones/res/mipmap-mdpi/ic_launcher.png b/src/es/senpaiediciones/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/senpaiediciones/res/mipmap-mdpi/ic_launcher.png
rename to src/es/senpaiediciones/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/senpaiediciones/res/mipmap-xhdpi/ic_launcher.png b/src/es/senpaiediciones/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/senpaiediciones/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/senpaiediciones/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/senpaiediciones/res/mipmap-xxhdpi/ic_launcher.png b/src/es/senpaiediciones/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/senpaiediciones/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/senpaiediciones/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/senpaiediciones/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/senpaiediciones/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/senpaiediciones/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/senpaiediciones/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/senpaiediciones/src/SenpaiEdiciones.kt b/src/es/senpaiediciones/src/eu/kanade/tachiyomi/extension/es/senpaiediciones/SenpaiEdiciones.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/senpaiediciones/src/SenpaiEdiciones.kt
rename to src/es/senpaiediciones/src/eu/kanade/tachiyomi/extension/es/senpaiediciones/SenpaiEdiciones.kt
diff --git a/src/es/shadowmangas/build.gradle b/src/es/shadowmangas/build.gradle
new file mode 100644
index 000000000..2be7279e9
--- /dev/null
+++ b/src/es/shadowmangas/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Shadow Mangas'
+ extClass = '.ShadowMangas'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://shadowmangas.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/shadowmangas/res/mipmap-hdpi/ic_launcher.png b/src/es/shadowmangas/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/shadowmangas/res/mipmap-hdpi/ic_launcher.png
rename to src/es/shadowmangas/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/shadowmangas/res/mipmap-mdpi/ic_launcher.png b/src/es/shadowmangas/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/shadowmangas/res/mipmap-mdpi/ic_launcher.png
rename to src/es/shadowmangas/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/shadowmangas/res/mipmap-xhdpi/ic_launcher.png b/src/es/shadowmangas/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/shadowmangas/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/shadowmangas/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/shadowmangas/res/mipmap-xxhdpi/ic_launcher.png b/src/es/shadowmangas/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/shadowmangas/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/shadowmangas/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/shadowmangas/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/shadowmangas/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/shadowmangas/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/shadowmangas/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/shadowmangas/src/ShadowMangas.kt b/src/es/shadowmangas/src/eu/kanade/tachiyomi/extension/es/shadowmangas/ShadowMangas.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/shadowmangas/src/ShadowMangas.kt
rename to src/es/shadowmangas/src/eu/kanade/tachiyomi/extension/es/shadowmangas/ShadowMangas.kt
diff --git a/src/es/shayami/build.gradle b/src/es/shayami/build.gradle
new file mode 100644
index 000000000..ecb9f65a5
--- /dev/null
+++ b/src/es/shayami/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Shayami'
+ extClass = '.Shayami'
+ themePkg = 'madara'
+ baseUrl = 'https://shayami.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/shayami/res/mipmap-hdpi/ic_launcher.png b/src/es/shayami/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shayami/res/mipmap-hdpi/ic_launcher.png
rename to src/es/shayami/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shayami/res/mipmap-mdpi/ic_launcher.png b/src/es/shayami/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shayami/res/mipmap-mdpi/ic_launcher.png
rename to src/es/shayami/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shayami/res/mipmap-xhdpi/ic_launcher.png b/src/es/shayami/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shayami/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/shayami/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shayami/res/mipmap-xxhdpi/ic_launcher.png b/src/es/shayami/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shayami/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/shayami/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shayami/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/shayami/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shayami/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/shayami/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shayami/src/Shayami.kt b/src/es/shayami/src/eu/kanade/tachiyomi/extension/es/shayami/Shayami.kt
similarity index 100%
rename from multisrc/overrides/madara/shayami/src/Shayami.kt
rename to src/es/shayami/src/eu/kanade/tachiyomi/extension/es/shayami/Shayami.kt
diff --git a/src/es/skymangas/build.gradle b/src/es/skymangas/build.gradle
new file mode 100644
index 000000000..7f9598c36
--- /dev/null
+++ b/src/es/skymangas/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'SkyMangas'
+ extClass = '.SkyMangas'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://skymangas.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/skymangas/res/mipmap-hdpi/ic_launcher.png b/src/es/skymangas/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/skymangas/res/mipmap-hdpi/ic_launcher.png
rename to src/es/skymangas/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/skymangas/res/mipmap-mdpi/ic_launcher.png b/src/es/skymangas/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/skymangas/res/mipmap-mdpi/ic_launcher.png
rename to src/es/skymangas/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/skymangas/res/mipmap-xhdpi/ic_launcher.png b/src/es/skymangas/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/skymangas/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/skymangas/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/skymangas/res/mipmap-xxhdpi/ic_launcher.png b/src/es/skymangas/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/skymangas/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/skymangas/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/skymangas/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/skymangas/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/skymangas/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/skymangas/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/skymangas/src/SkyMangas.kt b/src/es/skymangas/src/eu/kanade/tachiyomi/extension/es/skymangas/SkyMangas.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/skymangas/src/SkyMangas.kt
rename to src/es/skymangas/src/eu/kanade/tachiyomi/extension/es/skymangas/SkyMangas.kt
diff --git a/src/es/taurusfansub/build.gradle b/src/es/taurusfansub/build.gradle
new file mode 100644
index 000000000..e0b8b4a37
--- /dev/null
+++ b/src/es/taurusfansub/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Taurus Fansub'
+ extClass = '.TaurusFansub'
+ themePkg = 'madara'
+ baseUrl = 'https://taurusmanga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/taurusfansub/res/mipmap-hdpi/ic_launcher.png b/src/es/taurusfansub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/taurusfansub/res/mipmap-hdpi/ic_launcher.png
rename to src/es/taurusfansub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/taurusfansub/res/mipmap-mdpi/ic_launcher.png b/src/es/taurusfansub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/taurusfansub/res/mipmap-mdpi/ic_launcher.png
rename to src/es/taurusfansub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/taurusfansub/res/mipmap-xhdpi/ic_launcher.png b/src/es/taurusfansub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/taurusfansub/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/taurusfansub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/taurusfansub/res/mipmap-xxhdpi/ic_launcher.png b/src/es/taurusfansub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/taurusfansub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/taurusfansub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/taurusfansub/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/taurusfansub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/taurusfansub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/taurusfansub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/taurusfansub/src/TaurusFansub.kt b/src/es/taurusfansub/src/eu/kanade/tachiyomi/extension/es/taurusfansub/TaurusFansub.kt
similarity index 100%
rename from multisrc/overrides/madara/taurusfansub/src/TaurusFansub.kt
rename to src/es/taurusfansub/src/eu/kanade/tachiyomi/extension/es/taurusfansub/TaurusFansub.kt
diff --git a/src/es/tecnoscan/build.gradle b/src/es/tecnoscan/build.gradle
new file mode 100644
index 000000000..2ef458a0c
--- /dev/null
+++ b/src/es/tecnoscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Tecno Scan'
+ extClass = '.TecnoScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://tecnoscann.com'
+ overrideVersionCode = 6
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/tecnoscan/res/mipmap-hdpi/ic_launcher.png b/src/es/tecnoscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tecnoscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/tecnoscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tecnoscan/res/mipmap-mdpi/ic_launcher.png b/src/es/tecnoscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tecnoscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/tecnoscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tecnoscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/tecnoscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tecnoscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/tecnoscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tecnoscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/tecnoscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tecnoscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/tecnoscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tecnoscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/tecnoscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tecnoscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/tecnoscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tecnoscan/src/TecnoScan.kt b/src/es/tecnoscan/src/eu/kanade/tachiyomi/extension/es/tecnoscan/TecnoScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/tecnoscan/src/TecnoScan.kt
rename to src/es/tecnoscan/src/eu/kanade/tachiyomi/extension/es/tecnoscan/TecnoScan.kt
diff --git a/src/es/tenkaiscan/build.gradle b/src/es/tenkaiscan/build.gradle
new file mode 100644
index 000000000..08169e263
--- /dev/null
+++ b/src/es/tenkaiscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'TenkaiScan'
+ extClass = '.TenkaiScan'
+ themePkg = 'madara'
+ baseUrl = 'https://tenkaiscan.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/tenkaiscan/res/mipmap-hdpi/ic_launcher.png b/src/es/tenkaiscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tenkaiscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/tenkaiscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tenkaiscan/res/mipmap-mdpi/ic_launcher.png b/src/es/tenkaiscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tenkaiscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/tenkaiscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tenkaiscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/tenkaiscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tenkaiscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/tenkaiscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tenkaiscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/tenkaiscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tenkaiscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/tenkaiscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tenkaiscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/tenkaiscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tenkaiscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/tenkaiscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tenkaiscan/src/TenkaiScan.kt b/src/es/tenkaiscan/src/eu/kanade/tachiyomi/extension/es/tenkaiscan/TenkaiScan.kt
similarity index 100%
rename from multisrc/overrides/madara/tenkaiscan/src/TenkaiScan.kt
rename to src/es/tenkaiscan/src/eu/kanade/tachiyomi/extension/es/tenkaiscan/TenkaiScan.kt
diff --git a/src/es/traduccionesmoonlight/build.gradle b/src/es/traduccionesmoonlight/build.gradle
new file mode 100644
index 000000000..a63819398
--- /dev/null
+++ b/src/es/traduccionesmoonlight/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Traducciones Moonlight'
+ extClass = '.TraduccionesMoonlight'
+ themePkg = 'madara'
+ baseUrl = 'https://traduccionesmoonlight.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-hdpi/ic_launcher.png b/src/es/traduccionesmoonlight/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-hdpi/ic_launcher.png
rename to src/es/traduccionesmoonlight/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-mdpi/ic_launcher.png b/src/es/traduccionesmoonlight/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-mdpi/ic_launcher.png
rename to src/es/traduccionesmoonlight/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xhdpi/ic_launcher.png b/src/es/traduccionesmoonlight/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/traduccionesmoonlight/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xxhdpi/ic_launcher.png b/src/es/traduccionesmoonlight/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/traduccionesmoonlight/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/traduccionesmoonlight/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/traduccionesmoonlight/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/traduccionesmoonlight/src/TraduccionesMoonlight.kt b/src/es/traduccionesmoonlight/src/eu/kanade/tachiyomi/extension/es/traduccionesmoonlight/TraduccionesMoonlight.kt
similarity index 100%
rename from multisrc/overrides/madara/traduccionesmoonlight/src/TraduccionesMoonlight.kt
rename to src/es/traduccionesmoonlight/src/eu/kanade/tachiyomi/extension/es/traduccionesmoonlight/TraduccionesMoonlight.kt
diff --git a/src/es/tresdaosscan/build.gradle b/src/es/tresdaosscan/build.gradle
new file mode 100644
index 000000000..6f58a692e
--- /dev/null
+++ b/src/es/tresdaosscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Tres Daos Scan'
+ extClass = '.TresDaosScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://tresdaos.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/tresdaosscan/res/mipmap-hdpi/ic_launcher.png b/src/es/tresdaosscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tresdaosscan/res/mipmap-hdpi/ic_launcher.png
rename to src/es/tresdaosscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tresdaosscan/res/mipmap-mdpi/ic_launcher.png b/src/es/tresdaosscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tresdaosscan/res/mipmap-mdpi/ic_launcher.png
rename to src/es/tresdaosscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tresdaosscan/res/mipmap-xhdpi/ic_launcher.png b/src/es/tresdaosscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tresdaosscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/tresdaosscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tresdaosscan/res/mipmap-xxhdpi/ic_launcher.png b/src/es/tresdaosscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tresdaosscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/tresdaosscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tresdaosscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/tresdaosscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tresdaosscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/tresdaosscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tresdaosscan/src/TresDaosScan.kt b/src/es/tresdaosscan/src/eu/kanade/tachiyomi/extension/es/tresdaosscan/TresDaosScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/tresdaosscan/src/TresDaosScan.kt
rename to src/es/tresdaosscan/src/eu/kanade/tachiyomi/extension/es/tresdaosscan/TresDaosScan.kt
diff --git a/src/es/tumangaonline/build.gradle b/src/es/tumangaonline/build.gradle
new file mode 100644
index 000000000..484939b68
--- /dev/null
+++ b/src/es/tumangaonline/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'TuMangaOnline'
+ extClass = '.TuMangaOnline'
+ themePkg = 'lectortmo'
+ baseUrl = 'https://visortmo.com'
+ overrideVersionCode = 49
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/lectortmo/tumangaonline/res/mipmap-hdpi/ic_launcher.png b/src/es/tumangaonline/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/lectortmo/tumangaonline/res/mipmap-hdpi/ic_launcher.png
rename to src/es/tumangaonline/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/lectortmo/tumangaonline/res/mipmap-mdpi/ic_launcher.png b/src/es/tumangaonline/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/lectortmo/tumangaonline/res/mipmap-mdpi/ic_launcher.png
rename to src/es/tumangaonline/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/lectortmo/tumangaonline/res/mipmap-xhdpi/ic_launcher.png b/src/es/tumangaonline/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/lectortmo/tumangaonline/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/tumangaonline/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/lectortmo/tumangaonline/res/mipmap-xxhdpi/ic_launcher.png b/src/es/tumangaonline/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/lectortmo/tumangaonline/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/tumangaonline/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/lectortmo/tumangaonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/tumangaonline/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/lectortmo/tumangaonline/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/tumangaonline/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/lectortmo/tumangaonline/src/TuMangaOnline.kt b/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt
similarity index 100%
rename from multisrc/overrides/lectortmo/tumangaonline/src/TuMangaOnline.kt
rename to src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt
diff --git a/src/es/tumangaonlinesite/build.gradle b/src/es/tumangaonlinesite/build.gradle
new file mode 100644
index 000000000..4dfcbc0da
--- /dev/null
+++ b/src/es/tumangaonlinesite/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Tumangaonline.site'
+ extClass = '.TumangaonlineSite'
+ themePkg = 'madara'
+ baseUrl = 'https://tumangaonline.site'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/tumangaonlinesite/res/mipmap-hdpi/ic_launcher.png b/src/es/tumangaonlinesite/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tumangaonlinesite/res/mipmap-hdpi/ic_launcher.png
rename to src/es/tumangaonlinesite/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tumangaonlinesite/res/mipmap-mdpi/ic_launcher.png b/src/es/tumangaonlinesite/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tumangaonlinesite/res/mipmap-mdpi/ic_launcher.png
rename to src/es/tumangaonlinesite/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tumangaonlinesite/res/mipmap-xhdpi/ic_launcher.png b/src/es/tumangaonlinesite/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tumangaonlinesite/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/tumangaonlinesite/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tumangaonlinesite/res/mipmap-xxhdpi/ic_launcher.png b/src/es/tumangaonlinesite/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tumangaonlinesite/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/tumangaonlinesite/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tumangaonlinesite/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/tumangaonlinesite/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tumangaonlinesite/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/tumangaonlinesite/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tumangaonlinesite/src/TumangaonlineSite.kt b/src/es/tumangaonlinesite/src/eu/kanade/tachiyomi/extension/es/tumangaonlinesite/TumangaonlineSite.kt
similarity index 100%
rename from multisrc/overrides/madara/tumangaonlinesite/src/TumangaonlineSite.kt
rename to src/es/tumangaonlinesite/src/eu/kanade/tachiyomi/extension/es/tumangaonlinesite/TumangaonlineSite.kt
diff --git a/src/es/tumanhwasclub/build.gradle b/src/es/tumanhwasclub/build.gradle
new file mode 100644
index 000000000..c78eee321
--- /dev/null
+++ b/src/es/tumanhwasclub/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'TuManhwas.Club'
+ extClass = '.TuManhwasClub'
+ themePkg = 'manga18'
+ baseUrl = 'https://tumanhwas.club'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/es/tumanhwasclub/src/eu/kanade/tachiyomi/extension/es/tumanhwasclub/TuManhwasClub.kt b/src/es/tumanhwasclub/src/eu/kanade/tachiyomi/extension/es/tumanhwasclub/TuManhwasClub.kt
new file mode 100644
index 000000000..6ec14fc6b
--- /dev/null
+++ b/src/es/tumanhwasclub/src/eu/kanade/tachiyomi/extension/es/tumanhwasclub/TuManhwasClub.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.es.tumanhwasclub
+
+import eu.kanade.tachiyomi.multisrc.manga18.Manga18
+
+class TuManhwasClub : Manga18("TuManhwas.Club", "https://tumanhwas.club", "es")
diff --git a/src/es/unitoon/build.gradle b/src/es/unitoon/build.gradle
new file mode 100644
index 000000000..a06e5ff71
--- /dev/null
+++ b/src/es/unitoon/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Unitoon'
+ extClass = '.Unitoon'
+ themePkg = 'madara'
+ baseUrl = 'https://lectorunitoon.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/unitoon/res/mipmap-hdpi/ic_launcher.png b/src/es/unitoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/unitoon/res/mipmap-hdpi/ic_launcher.png
rename to src/es/unitoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/unitoon/res/mipmap-mdpi/ic_launcher.png b/src/es/unitoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/unitoon/res/mipmap-mdpi/ic_launcher.png
rename to src/es/unitoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/unitoon/res/mipmap-xhdpi/ic_launcher.png b/src/es/unitoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/unitoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/unitoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/unitoon/res/mipmap-xxhdpi/ic_launcher.png b/src/es/unitoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/unitoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/unitoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/unitoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/unitoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/unitoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/unitoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/unitoon/src/Unitoon.kt b/src/es/unitoon/src/eu/kanade/tachiyomi/extension/es/unitoon/Unitoon.kt
similarity index 100%
rename from multisrc/overrides/madara/unitoon/src/Unitoon.kt
rename to src/es/unitoon/src/eu/kanade/tachiyomi/extension/es/unitoon/Unitoon.kt
diff --git a/src/es/unitoonoficial/build.gradle b/src/es/unitoonoficial/build.gradle
new file mode 100644
index 000000000..9b72fdd42
--- /dev/null
+++ b/src/es/unitoonoficial/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Unitoon Oficial'
+ extClass = '.UnitoonOficial'
+ themePkg = 'madara'
+ baseUrl = 'https://unitoonoficial.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/unitoonoficial/res/mipmap-hdpi/ic_launcher.png b/src/es/unitoonoficial/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/unitoonoficial/res/mipmap-hdpi/ic_launcher.png
rename to src/es/unitoonoficial/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/unitoonoficial/res/mipmap-mdpi/ic_launcher.png b/src/es/unitoonoficial/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/unitoonoficial/res/mipmap-mdpi/ic_launcher.png
rename to src/es/unitoonoficial/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/unitoonoficial/res/mipmap-xhdpi/ic_launcher.png b/src/es/unitoonoficial/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/unitoonoficial/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/unitoonoficial/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/unitoonoficial/res/mipmap-xxhdpi/ic_launcher.png b/src/es/unitoonoficial/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/unitoonoficial/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/unitoonoficial/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/unitoonoficial/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/unitoonoficial/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/unitoonoficial/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/unitoonoficial/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/unitoonoficial/src/UnitoonOficial.kt b/src/es/unitoonoficial/src/eu/kanade/tachiyomi/extension/es/unitoonoficial/UnitoonOficial.kt
similarity index 100%
rename from multisrc/overrides/madara/unitoonoficial/src/UnitoonOficial.kt
rename to src/es/unitoonoficial/src/eu/kanade/tachiyomi/extension/es/unitoonoficial/UnitoonOficial.kt
diff --git a/src/es/vermanhwas/build.gradle b/src/es/vermanhwas/build.gradle
new file mode 100644
index 000000000..e9f12329a
--- /dev/null
+++ b/src/es/vermanhwas/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Ver Manhwas'
+ extClass = '.VerManhwas'
+ themePkg = 'madara'
+ baseUrl = 'https://vermanhwa.es'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/vermanhwas/res/mipmap-hdpi/ic_launcher.png b/src/es/vermanhwas/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/vermanhwas/res/mipmap-hdpi/ic_launcher.png
rename to src/es/vermanhwas/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/vermanhwas/res/mipmap-mdpi/ic_launcher.png b/src/es/vermanhwas/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/vermanhwas/res/mipmap-mdpi/ic_launcher.png
rename to src/es/vermanhwas/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/vermanhwas/res/mipmap-xhdpi/ic_launcher.png b/src/es/vermanhwas/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/vermanhwas/res/mipmap-xhdpi/ic_launcher.png
rename to src/es/vermanhwas/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/vermanhwas/res/mipmap-xxhdpi/ic_launcher.png b/src/es/vermanhwas/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/vermanhwas/res/mipmap-xxhdpi/ic_launcher.png
rename to src/es/vermanhwas/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/vermanhwas/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/vermanhwas/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/vermanhwas/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/es/vermanhwas/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/vermanhwas/src/VerManhwas.kt b/src/es/vermanhwas/src/eu/kanade/tachiyomi/extension/es/vermanhwas/VerManhwas.kt
similarity index 100%
rename from multisrc/overrides/madara/vermanhwas/src/VerManhwas.kt
rename to src/es/vermanhwas/src/eu/kanade/tachiyomi/extension/es/vermanhwas/VerManhwas.kt
diff --git a/src/fr/astralmanga/build.gradle b/src/fr/astralmanga/build.gradle
new file mode 100644
index 000000000..be33266fe
--- /dev/null
+++ b/src/fr/astralmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Astral-Manga'
+ extClass = '.AstralManga'
+ themePkg = 'madara'
+ baseUrl = 'https://astral-manga.fr'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/astralmanga/res/mipmap-hdpi/ic_launcher.png b/src/fr/astralmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/astralmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/astralmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/astralmanga/res/mipmap-mdpi/ic_launcher.png b/src/fr/astralmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/astralmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/astralmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/astralmanga/res/mipmap-xhdpi/ic_launcher.png b/src/fr/astralmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/astralmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/astralmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/astralmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/astralmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/astralmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/astralmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/astralmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/astralmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/astralmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/astralmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/astralmanga/src/AstralManga.kt b/src/fr/astralmanga/src/eu/kanade/tachiyomi/extension/fr/astralmanga/AstralManga.kt
similarity index 100%
rename from multisrc/overrides/madara/astralmanga/src/AstralManga.kt
rename to src/fr/astralmanga/src/eu/kanade/tachiyomi/extension/fr/astralmanga/AstralManga.kt
diff --git a/src/fr/bananascan/build.gradle b/src/fr/bananascan/build.gradle
new file mode 100644
index 000000000..b48ace2b5
--- /dev/null
+++ b/src/fr/bananascan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Banana-Scan'
+ extClass = '.BananaScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://banana-scan.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/bananascan/src/BananaScan.kt b/src/fr/bananascan/src/eu/kanade/tachiyomi/extension/fr/bananascan/BananaScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/bananascan/src/BananaScan.kt
rename to src/fr/bananascan/src/eu/kanade/tachiyomi/extension/fr/bananascan/BananaScan.kt
diff --git a/src/fr/bentoscan/build.gradle b/src/fr/bentoscan/build.gradle
new file mode 100644
index 000000000..bc3d3be8f
--- /dev/null
+++ b/src/fr/bentoscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Bentoscan'
+ extClass = '.Bentoscan'
+ themePkg = 'mmrcms'
+ baseUrl = 'https://bentoscan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mmrcms/bentoscan/src/Bentoscan.kt b/src/fr/bentoscan/src/eu/kanade/tachiyomi/extension/fr/bentoscan/Bentoscan.kt
similarity index 100%
rename from multisrc/overrides/mmrcms/bentoscan/src/Bentoscan.kt
rename to src/fr/bentoscan/src/eu/kanade/tachiyomi/extension/fr/bentoscan/Bentoscan.kt
diff --git a/src/fr/epsilonscan/build.gradle b/src/fr/epsilonscan/build.gradle
new file mode 100644
index 000000000..d266a204d
--- /dev/null
+++ b/src/fr/epsilonscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Epsilon Scan'
+ extClass = '.EpsilonScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://epsilonscan.fr'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/epsilonscan/res/mipmap-hdpi/ic_launcher.png b/src/fr/epsilonscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/epsilonscan/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/epsilonscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/epsilonscan/res/mipmap-mdpi/ic_launcher.png b/src/fr/epsilonscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/epsilonscan/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/epsilonscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/epsilonscan/res/mipmap-xhdpi/ic_launcher.png b/src/fr/epsilonscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/epsilonscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/epsilonscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/epsilonscan/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/epsilonscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/epsilonscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/epsilonscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/epsilonscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/epsilonscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/epsilonscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/epsilonscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/epsilonscan/src/EpsilonScan.kt b/src/fr/epsilonscan/src/eu/kanade/tachiyomi/extension/fr/epsilonscan/EpsilonScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/epsilonscan/src/EpsilonScan.kt
rename to src/fr/epsilonscan/src/eu/kanade/tachiyomi/extension/fr/epsilonscan/EpsilonScan.kt
diff --git a/src/fr/flamescansfr/build.gradle b/src/fr/flamescansfr/build.gradle
new file mode 100644
index 000000000..0a90ad7a2
--- /dev/null
+++ b/src/fr/flamescansfr/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Legacy Scans'
+ extClass = '.LegacyScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://legacy-scans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/flamescansfr/res/mipmap-hdpi/ic_launcher.png b/src/fr/flamescansfr/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/flamescansfr/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/flamescansfr/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/flamescansfr/res/mipmap-mdpi/ic_launcher.png b/src/fr/flamescansfr/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/flamescansfr/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/flamescansfr/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/flamescansfr/res/mipmap-xhdpi/ic_launcher.png b/src/fr/flamescansfr/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/flamescansfr/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/flamescansfr/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/flamescansfr/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/flamescansfr/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/flamescansfr/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/flamescansfr/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/flamescansfr/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/flamescansfr/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/flamescansfr/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/flamescansfr/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/flamescansfr/src/LegacyScans.kt b/src/fr/flamescansfr/src/eu/kanade/tachiyomi/extension/fr/flamescansfr/LegacyScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/flamescansfr/src/LegacyScans.kt
rename to src/fr/flamescansfr/src/eu/kanade/tachiyomi/extension/fr/flamescansfr/LegacyScans.kt
diff --git a/src/fr/frdashscan/build.gradle b/src/fr/frdashscan/build.gradle
new file mode 100644
index 000000000..24be20d7d
--- /dev/null
+++ b/src/fr/frdashscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'FR-Scan'
+ extClass = '.FRScan'
+ themePkg = 'madara'
+ baseUrl = 'https://fr-scan.com'
+ overrideVersionCode = 5
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/frdashscan/res/mipmap-hdpi/ic_launcher.png b/src/fr/frdashscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/frdashscan/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/frdashscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/frdashscan/res/mipmap-mdpi/ic_launcher.png b/src/fr/frdashscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/frdashscan/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/frdashscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/frdashscan/res/mipmap-xhdpi/ic_launcher.png b/src/fr/frdashscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/frdashscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/frdashscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/frdashscan/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/frdashscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/frdashscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/frdashscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/frdashscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/frdashscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/frdashscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/frdashscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/frdashscan/src/FRScan.kt b/src/fr/frdashscan/src/eu/kanade/tachiyomi/extension/fr/frdashscan/FRScan.kt
similarity index 100%
rename from multisrc/overrides/madara/frdashscan/src/FRScan.kt
rename to src/fr/frdashscan/src/eu/kanade/tachiyomi/extension/fr/frdashscan/FRScan.kt
diff --git a/src/fr/gloryscans/build.gradle b/src/fr/gloryscans/build.gradle
new file mode 100644
index 000000000..4dcee7dee
--- /dev/null
+++ b/src/fr/gloryscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Glory Scans'
+ extClass = '.GloryScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://gloryscans.fr'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/gloryscans/res/mipmap-hdpi/ic_launcher.png b/src/fr/gloryscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/gloryscans/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/gloryscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/gloryscans/res/mipmap-mdpi/ic_launcher.png b/src/fr/gloryscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/gloryscans/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/gloryscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/gloryscans/res/mipmap-xhdpi/ic_launcher.png b/src/fr/gloryscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/gloryscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/gloryscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/gloryscans/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/gloryscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/gloryscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/gloryscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/gloryscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/gloryscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/gloryscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/gloryscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/gloryscans/src/GloryScans.kt b/src/fr/gloryscans/src/eu/kanade/tachiyomi/extension/fr/gloryscans/GloryScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/gloryscans/src/GloryScans.kt
rename to src/fr/gloryscans/src/eu/kanade/tachiyomi/extension/fr/gloryscans/GloryScans.kt
diff --git a/src/fr/hentaiscantrad/build.gradle b/src/fr/hentaiscantrad/build.gradle
new file mode 100644
index 000000000..0009d8ff2
--- /dev/null
+++ b/src/fr/hentaiscantrad/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hentai-Scantrad'
+ extClass = '.HentaiScantrad'
+ themePkg = 'madara'
+ baseUrl = 'https://hentai.scantrad-vf.cc'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentaiscantrad/res/mipmap-hdpi/ic_launcher.png b/src/fr/hentaiscantrad/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaiscantrad/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/hentaiscantrad/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaiscantrad/res/mipmap-mdpi/ic_launcher.png b/src/fr/hentaiscantrad/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaiscantrad/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/hentaiscantrad/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaiscantrad/res/mipmap-xhdpi/ic_launcher.png b/src/fr/hentaiscantrad/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaiscantrad/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/hentaiscantrad/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaiscantrad/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/hentaiscantrad/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaiscantrad/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/hentaiscantrad/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaiscantrad/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/hentaiscantrad/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaiscantrad/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/hentaiscantrad/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaiscantrad/src/HentaiScantrad.kt b/src/fr/hentaiscantrad/src/eu/kanade/tachiyomi/extension/fr/hentaiscantrad/HentaiScantrad.kt
similarity index 100%
rename from multisrc/overrides/madara/hentaiscantrad/src/HentaiScantrad.kt
rename to src/fr/hentaiscantrad/src/eu/kanade/tachiyomi/extension/fr/hentaiscantrad/HentaiScantrad.kt
diff --git a/src/fr/hentaizone/build.gradle b/src/fr/hentaizone/build.gradle
new file mode 100644
index 000000000..e5fe89e44
--- /dev/null
+++ b/src/fr/hentaizone/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HentaiZone'
+ extClass = '.HentaiZone'
+ themePkg = 'madara'
+ baseUrl = 'https://hentaizone.xyz'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentaizone/res/mipmap-hdpi/ic_launcher.png b/src/fr/hentaizone/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaizone/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/hentaizone/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaizone/res/mipmap-mdpi/ic_launcher.png b/src/fr/hentaizone/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaizone/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/hentaizone/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaizone/res/mipmap-xhdpi/ic_launcher.png b/src/fr/hentaizone/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaizone/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/hentaizone/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaizone/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/hentaizone/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaizone/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/hentaizone/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaizone/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/hentaizone/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaizone/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/hentaizone/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaizone/src/HentaiZone.kt b/src/fr/hentaizone/src/eu/kanade/tachiyomi/extension/fr/hentaizone/HentaiZone.kt
similarity index 100%
rename from multisrc/overrides/madara/hentaizone/src/HentaiZone.kt
rename to src/fr/hentaizone/src/eu/kanade/tachiyomi/extension/fr/hentaizone/HentaiZone.kt
diff --git a/src/fr/histoiredhentai/build.gradle b/src/fr/histoiredhentai/build.gradle
new file mode 100644
index 000000000..9d95a463e
--- /dev/null
+++ b/src/fr/histoiredhentai/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HistoireDHentai'
+ extClass = '.HistoireDHentai'
+ themePkg = 'madara'
+ baseUrl = 'https://hhentai.fr'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/histoiredhentai/res/mipmap-hdpi/ic_launcher.png b/src/fr/histoiredhentai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/histoiredhentai/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/histoiredhentai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/histoiredhentai/res/mipmap-mdpi/ic_launcher.png b/src/fr/histoiredhentai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/histoiredhentai/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/histoiredhentai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/histoiredhentai/res/mipmap-xhdpi/ic_launcher.png b/src/fr/histoiredhentai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/histoiredhentai/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/histoiredhentai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/histoiredhentai/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/histoiredhentai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/histoiredhentai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/histoiredhentai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/histoiredhentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/histoiredhentai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/histoiredhentai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/histoiredhentai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/histoiredhentai/src/HistoireDHentai.kt b/src/fr/histoiredhentai/src/eu/kanade/tachiyomi/extension/fr/histoiredhentai/HistoireDHentai.kt
similarity index 100%
rename from multisrc/overrides/madara/histoiredhentai/src/HistoireDHentai.kt
rename to src/fr/histoiredhentai/src/eu/kanade/tachiyomi/extension/fr/histoiredhentai/HistoireDHentai.kt
diff --git a/src/fr/jpmangas/build.gradle b/src/fr/jpmangas/build.gradle
new file mode 100644
index 000000000..6d687f9cd
--- /dev/null
+++ b/src/fr/jpmangas/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Jpmangas'
+ extClass = '.Jpmangas'
+ themePkg = 'mmrcms'
+ baseUrl = 'https://jpmangas.xyz'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mmrcms/jpmangas/src/Jpmangas.kt b/src/fr/jpmangas/src/eu/kanade/tachiyomi/extension/fr/jpmangas/Jpmangas.kt
similarity index 100%
rename from multisrc/overrides/mmrcms/jpmangas/src/Jpmangas.kt
rename to src/fr/jpmangas/src/eu/kanade/tachiyomi/extension/fr/jpmangas/Jpmangas.kt
diff --git a/src/fr/lelmanga/build.gradle b/src/fr/lelmanga/build.gradle
new file mode 100644
index 000000000..d8921aee6
--- /dev/null
+++ b/src/fr/lelmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Lelmanga'
+ extClass = '.Lelmanga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://www.lelmanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/lelmanga/res/mipmap-hdpi/ic_launcher.png b/src/fr/lelmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lelmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/lelmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lelmanga/res/mipmap-mdpi/ic_launcher.png b/src/fr/lelmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lelmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/lelmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lelmanga/res/mipmap-xhdpi/ic_launcher.png b/src/fr/lelmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lelmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/lelmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lelmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/lelmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lelmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/lelmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lelmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/lelmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lelmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/lelmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lelmanga/src/Lelmanga.kt b/src/fr/lelmanga/src/eu/kanade/tachiyomi/extension/fr/lelmanga/Lelmanga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/lelmanga/src/Lelmanga.kt
rename to src/fr/lelmanga/src/eu/kanade/tachiyomi/extension/fr/lelmanga/Lelmanga.kt
diff --git a/src/fr/lelscanvf/build.gradle b/src/fr/lelscanvf/build.gradle
new file mode 100644
index 000000000..ede73e46e
--- /dev/null
+++ b/src/fr/lelscanvf/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Lelscan-VF'
+ extClass = '.LelscanVF'
+ themePkg = 'mmrcms'
+ baseUrl = 'https://lelscanvf.cc'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mmrcms/lelscanvf/src/LelscanVF.kt b/src/fr/lelscanvf/src/eu/kanade/tachiyomi/extension/fr/lelscanvf/LelscanVF.kt
similarity index 100%
rename from multisrc/overrides/mmrcms/lelscanvf/src/LelscanVF.kt
rename to src/fr/lelscanvf/src/eu/kanade/tachiyomi/extension/fr/lelscanvf/LelscanVF.kt
diff --git a/src/fr/mangahubfr/build.gradle b/src/fr/mangahubfr/build.gradle
new file mode 100644
index 000000000..babcc1e6b
--- /dev/null
+++ b/src/fr/mangahubfr/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaHub.fr'
+ extClass = '.MangaHubFr'
+ themePkg = 'madara'
+ baseUrl = 'https://mangahub.fr'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangahubfr/res/mipmap-hdpi/ic_launcher.png b/src/fr/mangahubfr/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangahubfr/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/mangahubfr/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangahubfr/res/mipmap-mdpi/ic_launcher.png b/src/fr/mangahubfr/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangahubfr/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/mangahubfr/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangahubfr/res/mipmap-xhdpi/ic_launcher.png b/src/fr/mangahubfr/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangahubfr/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/mangahubfr/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangahubfr/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/mangahubfr/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangahubfr/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/mangahubfr/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangahubfr/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/mangahubfr/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangahubfr/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/mangahubfr/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangahubfr/src/MangaHubFr.kt b/src/fr/mangahubfr/src/eu/kanade/tachiyomi/extension/fr/mangahubfr/MangaHubFr.kt
similarity index 100%
rename from multisrc/overrides/madara/mangahubfr/src/MangaHubFr.kt
rename to src/fr/mangahubfr/src/eu/kanade/tachiyomi/extension/fr/mangahubfr/MangaHubFr.kt
diff --git a/src/fr/mangascan/build.gradle b/src/fr/mangascan/build.gradle
new file mode 100644
index 000000000..9589559ec
--- /dev/null
+++ b/src/fr/mangascan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga-Scan'
+ extClass = '.MangaScan'
+ themePkg = 'mmrcms'
+ baseUrl = 'https://mangascan-fr.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mmrcms/mangascan/src/MangaScan.kt b/src/fr/mangascan/src/eu/kanade/tachiyomi/extension/fr/mangascan/MangaScan.kt
similarity index 100%
rename from multisrc/overrides/mmrcms/mangascan/src/MangaScan.kt
rename to src/fr/mangascan/src/eu/kanade/tachiyomi/extension/fr/mangascan/MangaScan.kt
diff --git a/src/fr/mangascantrad/build.gradle b/src/fr/mangascantrad/build.gradle
new file mode 100644
index 000000000..aaeae3f19
--- /dev/null
+++ b/src/fr/mangascantrad/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga-Scantrad'
+ extClass = '.MangaScantrad'
+ themePkg = 'madara'
+ baseUrl = 'https://manga-scantrad.io'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangascantrad/res/mipmap-hdpi/ic_launcher.png b/src/fr/mangascantrad/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangascantrad/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/mangascantrad/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangascantrad/res/mipmap-mdpi/ic_launcher.png b/src/fr/mangascantrad/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangascantrad/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/mangascantrad/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangascantrad/res/mipmap-xhdpi/ic_launcher.png b/src/fr/mangascantrad/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangascantrad/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/mangascantrad/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangascantrad/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/mangascantrad/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangascantrad/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/mangascantrad/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangascantrad/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/mangascantrad/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangascantrad/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/mangascantrad/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangascantrad/src/MangaScantrad.kt b/src/fr/mangascantrad/src/eu/kanade/tachiyomi/extension/fr/mangascantrad/MangaScantrad.kt
similarity index 100%
rename from multisrc/overrides/madara/mangascantrad/src/MangaScantrad.kt
rename to src/fr/mangascantrad/src/eu/kanade/tachiyomi/extension/fr/mangascantrad/MangaScantrad.kt
diff --git a/src/fr/mangasorigines/build.gradle b/src/fr/mangasorigines/build.gradle
new file mode 100644
index 000000000..9561a4197
--- /dev/null
+++ b/src/fr/mangasorigines/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Mangas Origines'
+ extClass = '.MangasOrigines'
+ themePkg = 'madara'
+ baseUrl = 'https://mangas-origines.xyz'
+ overrideVersionCode = 4
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangasorigines/res/mipmap-hdpi/ic_launcher.png b/src/fr/mangasorigines/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasorigines/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/mangasorigines/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasorigines/res/mipmap-mdpi/ic_launcher.png b/src/fr/mangasorigines/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasorigines/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/mangasorigines/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasorigines/res/mipmap-xhdpi/ic_launcher.png b/src/fr/mangasorigines/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasorigines/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/mangasorigines/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasorigines/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/mangasorigines/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasorigines/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/mangasorigines/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasorigines/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/mangasorigines/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasorigines/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/mangasorigines/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasorigines/src/MangasOrigines.kt b/src/fr/mangasorigines/src/eu/kanade/tachiyomi/extension/fr/mangasorigines/MangasOrigines.kt
similarity index 100%
rename from multisrc/overrides/madara/mangasorigines/src/MangasOrigines.kt
rename to src/fr/mangasorigines/src/eu/kanade/tachiyomi/extension/fr/mangasorigines/MangasOrigines.kt
diff --git a/src/fr/mangasoriginesfr/build.gradle b/src/fr/mangasoriginesfr/build.gradle
new file mode 100644
index 000000000..7c8bee96b
--- /dev/null
+++ b/src/fr/mangasoriginesfr/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangas-Origines.fr'
+ extClass = '.MangasOriginesFr'
+ themePkg = 'madara'
+ baseUrl = 'https://mangas-origines.fr'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangasoriginesfr/res/mipmap-hdpi/ic_launcher.png b/src/fr/mangasoriginesfr/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasoriginesfr/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/mangasoriginesfr/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasoriginesfr/res/mipmap-mdpi/ic_launcher.png b/src/fr/mangasoriginesfr/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasoriginesfr/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/mangasoriginesfr/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasoriginesfr/res/mipmap-xhdpi/ic_launcher.png b/src/fr/mangasoriginesfr/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasoriginesfr/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/mangasoriginesfr/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasoriginesfr/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/mangasoriginesfr/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasoriginesfr/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/mangasoriginesfr/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasoriginesfr/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/mangasoriginesfr/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasoriginesfr/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/mangasoriginesfr/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasoriginesfr/src/MangasOriginesFr.kt b/src/fr/mangasoriginesfr/src/eu/kanade/tachiyomi/extension/fr/mangasoriginesfr/MangasOriginesFr.kt
similarity index 100%
rename from multisrc/overrides/madara/mangasoriginesfr/src/MangasOriginesFr.kt
rename to src/fr/mangasoriginesfr/src/eu/kanade/tachiyomi/extension/fr/mangasoriginesfr/MangasOriginesFr.kt
diff --git a/src/fr/manhwafreakfr/build.gradle b/src/fr/manhwafreakfr/build.gradle
new file mode 100644
index 000000000..c5a81c5b0
--- /dev/null
+++ b/src/fr/manhwafreakfr/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhwaFreak'
+ extClass = '.ManhwaFreakFR'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://manhwafreak.fr'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/manhwafreakfr/res/mipmap-hdpi/ic_launcher.png b/src/fr/manhwafreakfr/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwafreakfr/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/manhwafreakfr/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwafreakfr/res/mipmap-mdpi/ic_launcher.png b/src/fr/manhwafreakfr/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwafreakfr/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/manhwafreakfr/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwafreakfr/res/mipmap-xhdpi/ic_launcher.png b/src/fr/manhwafreakfr/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwafreakfr/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/manhwafreakfr/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwafreakfr/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/manhwafreakfr/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwafreakfr/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/manhwafreakfr/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwafreakfr/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/manhwafreakfr/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwafreakfr/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/manhwafreakfr/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwafreakfr/src/ManhwaFreakFR.kt b/src/fr/manhwafreakfr/src/eu/kanade/tachiyomi/extension/fr/manhwafreakfr/ManhwaFreakFR.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwafreakfr/src/ManhwaFreakFR.kt
rename to src/fr/manhwafreakfr/src/eu/kanade/tachiyomi/extension/fr/manhwafreakfr/ManhwaFreakFR.kt
diff --git a/src/fr/pantheonscan/build.gradle b/src/fr/pantheonscan/build.gradle
new file mode 100644
index 000000000..827f33821
--- /dev/null
+++ b/src/fr/pantheonscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Pantheon Scan'
+ extClass = '.PantheonScan'
+ themePkg = 'madara'
+ baseUrl = 'https://pantheon-scan.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/pantheonscan/res/mipmap-hdpi/ic_launcher.png b/src/fr/pantheonscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pantheonscan/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/pantheonscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pantheonscan/res/mipmap-mdpi/ic_launcher.png b/src/fr/pantheonscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pantheonscan/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/pantheonscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pantheonscan/res/mipmap-xhdpi/ic_launcher.png b/src/fr/pantheonscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pantheonscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/pantheonscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pantheonscan/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/pantheonscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pantheonscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/pantheonscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pantheonscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/pantheonscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pantheonscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/pantheonscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pantheonscan/src/PantheonScan.kt b/src/fr/pantheonscan/src/eu/kanade/tachiyomi/extension/fr/pantheonscan/PantheonScan.kt
similarity index 100%
rename from multisrc/overrides/madara/pantheonscan/src/PantheonScan.kt
rename to src/fr/pantheonscan/src/eu/kanade/tachiyomi/extension/fr/pantheonscan/PantheonScan.kt
diff --git a/src/fr/perfscan/build.gradle b/src/fr/perfscan/build.gradle
new file mode 100644
index 000000000..5122d15bd
--- /dev/null
+++ b/src/fr/perfscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Perf Scan'
+ extClass = '.PerfScan'
+ themePkg = 'heancms'
+ baseUrl = 'https://perf-scan.fr'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/heancms/perfscan/res/mipmap-hdpi/ic_launcher.png b/src/fr/perfscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/perfscan/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/perfscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/perfscan/res/mipmap-mdpi/ic_launcher.png b/src/fr/perfscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/perfscan/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/perfscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/perfscan/res/mipmap-xhdpi/ic_launcher.png b/src/fr/perfscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/perfscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/perfscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/perfscan/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/perfscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/perfscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/perfscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/perfscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/perfscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/heancms/perfscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/perfscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/heancms/perfscan/src/PerfScan.kt b/src/fr/perfscan/src/eu/kanade/tachiyomi/extension/fr/perfscan/PerfScan.kt
similarity index 100%
rename from multisrc/overrides/heancms/perfscan/src/PerfScan.kt
rename to src/fr/perfscan/src/eu/kanade/tachiyomi/extension/fr/perfscan/PerfScan.kt
diff --git a/src/fr/phenixscans/build.gradle b/src/fr/phenixscans/build.gradle
new file mode 100644
index 000000000..9a9530667
--- /dev/null
+++ b/src/fr/phenixscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'PhenixScans'
+ extClass = '.PhenixScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://phenixscans.fr'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/phenixscans/res/mipmap-hdpi/ic_launcher.png b/src/fr/phenixscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/phenixscans/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/phenixscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/phenixscans/res/mipmap-mdpi/ic_launcher.png b/src/fr/phenixscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/phenixscans/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/phenixscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/phenixscans/res/mipmap-xhdpi/ic_launcher.png b/src/fr/phenixscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/phenixscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/phenixscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/phenixscans/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/phenixscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/phenixscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/phenixscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/phenixscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/phenixscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/phenixscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/phenixscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/phenixscans/src/PhenixScans.kt b/src/fr/phenixscans/src/eu/kanade/tachiyomi/extension/fr/phenixscans/PhenixScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/phenixscans/src/PhenixScans.kt
rename to src/fr/phenixscans/src/eu/kanade/tachiyomi/extension/fr/phenixscans/PhenixScans.kt
diff --git a/src/fr/raijinscans/build.gradle b/src/fr/raijinscans/build.gradle
new file mode 100644
index 000000000..de4ec0cd0
--- /dev/null
+++ b/src/fr/raijinscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Raijin Scans'
+ extClass = '.RaijinScans'
+ themePkg = 'madara'
+ baseUrl = 'https://raijinscans.fr'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/raijinscans/res/mipmap-hdpi/ic_launcher.png b/src/fr/raijinscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/raijinscans/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/raijinscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/raijinscans/res/mipmap-mdpi/ic_launcher.png b/src/fr/raijinscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/raijinscans/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/raijinscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/raijinscans/res/mipmap-xhdpi/ic_launcher.png b/src/fr/raijinscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/raijinscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/raijinscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/raijinscans/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/raijinscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/raijinscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/raijinscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/raijinscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/raijinscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/raijinscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/raijinscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/raijinscans/src/RaijinScans.kt b/src/fr/raijinscans/src/eu/kanade/tachiyomi/extension/fr/raijinscans/RaijinScans.kt
similarity index 100%
rename from multisrc/overrides/madara/raijinscans/src/RaijinScans.kt
rename to src/fr/raijinscans/src/eu/kanade/tachiyomi/extension/fr/raijinscans/RaijinScans.kt
diff --git a/src/fr/readergen/build.gradle b/src/fr/readergen/build.gradle
new file mode 100644
index 000000000..2fd90dba9
--- /dev/null
+++ b/src/fr/readergen/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ReaderGen'
+ extClass = '.ReaderGen'
+ themePkg = 'madara'
+ baseUrl = 'https://fr.readergen.fr'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/readergen/res/mipmap-hdpi/ic_launcher.png b/src/fr/readergen/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readergen/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/readergen/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readergen/res/mipmap-mdpi/ic_launcher.png b/src/fr/readergen/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readergen/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/readergen/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readergen/res/mipmap-xhdpi/ic_launcher.png b/src/fr/readergen/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readergen/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/readergen/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readergen/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/readergen/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readergen/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/readergen/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readergen/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/readergen/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/readergen/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/readergen/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/readergen/src/ReaderGen.kt b/src/fr/readergen/src/eu/kanade/tachiyomi/extension/fr/readergen/ReaderGen.kt
similarity index 100%
rename from multisrc/overrides/madara/readergen/src/ReaderGen.kt
rename to src/fr/readergen/src/eu/kanade/tachiyomi/extension/fr/readergen/ReaderGen.kt
diff --git a/src/fr/reaperscans/build.gradle b/src/fr/reaperscans/build.gradle
new file mode 100644
index 000000000..8b39a30e7
--- /dev/null
+++ b/src/fr/reaperscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Reaper Scans'
+ extClass = '.ReaperScans'
+ themePkg = 'madara'
+ baseUrl = 'https://reaperscans.fr'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/reaperscans/res/mipmap-hdpi/ic_launcher.png b/src/fr/reaperscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/reaperscans/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/reaperscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/reaperscans/res/mipmap-mdpi/ic_launcher.png b/src/fr/reaperscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/reaperscans/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/reaperscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/reaperscans/res/mipmap-xhdpi/ic_launcher.png b/src/fr/reaperscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/reaperscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/reaperscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/reaperscans/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/reaperscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/reaperscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/reaperscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/reaperscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/reaperscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/reaperscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/reaperscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/reaperscans/src/ReaperScans.kt b/src/fr/reaperscans/src/eu/kanade/tachiyomi/extension/fr/reaperscans/ReaperScans.kt
similarity index 100%
rename from multisrc/overrides/madara/reaperscans/src/ReaperScans.kt
rename to src/fr/reaperscans/src/eu/kanade/tachiyomi/extension/fr/reaperscans/ReaperScans.kt
diff --git a/src/fr/scanhentaifr/build.gradle b/src/fr/scanhentaifr/build.gradle
new file mode 100644
index 000000000..937b23618
--- /dev/null
+++ b/src/fr/scanhentaifr/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Scan Hentai FR'
+ extClass = '.ScanHentaiFR'
+ themePkg = 'madara'
+ baseUrl = 'https://scan-hentai.fr'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/scanhentaifr/res/mipmap-hdpi/ic_launcher.png b/src/fr/scanhentaifr/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scanhentaifr/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/scanhentaifr/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scanhentaifr/res/mipmap-mdpi/ic_launcher.png b/src/fr/scanhentaifr/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scanhentaifr/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/scanhentaifr/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scanhentaifr/res/mipmap-xhdpi/ic_launcher.png b/src/fr/scanhentaifr/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scanhentaifr/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/scanhentaifr/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scanhentaifr/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/scanhentaifr/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scanhentaifr/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/scanhentaifr/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scanhentaifr/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/scanhentaifr/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scanhentaifr/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/scanhentaifr/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scanhentaifr/src/ScanHentaiFR.kt b/src/fr/scanhentaifr/src/eu/kanade/tachiyomi/extension/fr/scanhentaifr/ScanHentaiFR.kt
similarity index 100%
rename from multisrc/overrides/madara/scanhentaifr/src/ScanHentaiFR.kt
rename to src/fr/scanhentaifr/src/eu/kanade/tachiyomi/extension/fr/scanhentaifr/ScanHentaiFR.kt
diff --git a/src/fr/scanhentaimenu/build.gradle b/src/fr/scanhentaimenu/build.gradle
new file mode 100644
index 000000000..d07ddbf5d
--- /dev/null
+++ b/src/fr/scanhentaimenu/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Scan Hentai Menu'
+ extClass = '.ScanHentaiMenu'
+ themePkg = 'madara'
+ baseUrl = 'https://scan.hentai.menu'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/scanhentaimenu/res/mipmap-hdpi/ic_launcher.png b/src/fr/scanhentaimenu/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scanhentaimenu/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/scanhentaimenu/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scanhentaimenu/res/mipmap-mdpi/ic_launcher.png b/src/fr/scanhentaimenu/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scanhentaimenu/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/scanhentaimenu/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scanhentaimenu/res/mipmap-xhdpi/ic_launcher.png b/src/fr/scanhentaimenu/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scanhentaimenu/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/scanhentaimenu/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scanhentaimenu/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/scanhentaimenu/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scanhentaimenu/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/scanhentaimenu/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scanhentaimenu/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/scanhentaimenu/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/scanhentaimenu/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/scanhentaimenu/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/scanhentaimenu/src/ScanHentaiMenu.kt b/src/fr/scanhentaimenu/src/eu/kanade/tachiyomi/extension/fr/scanhentaimenu/ScanHentaiMenu.kt
similarity index 100%
rename from multisrc/overrides/madara/scanhentaimenu/src/ScanHentaiMenu.kt
rename to src/fr/scanhentaimenu/src/eu/kanade/tachiyomi/extension/fr/scanhentaimenu/ScanHentaiMenu.kt
diff --git a/src/fr/scanvf/build.gradle b/src/fr/scanvf/build.gradle
new file mode 100644
index 000000000..9a3e75383
--- /dev/null
+++ b/src/fr/scanvf/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Scan VF'
+ extClass = '.ScanVF'
+ themePkg = 'mmrcms'
+ baseUrl = 'https://www.scan-vf.net'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mmrcms/scanvf/res/mipmap-hdpi/ic_launcher.png b/src/fr/scanvf/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/scanvf/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/scanvf/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/scanvf/res/mipmap-mdpi/ic_launcher.png b/src/fr/scanvf/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/scanvf/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/scanvf/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/scanvf/res/mipmap-xhdpi/ic_launcher.png b/src/fr/scanvf/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/scanvf/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/scanvf/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/scanvf/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/scanvf/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/scanvf/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/scanvf/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/scanvf/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/scanvf/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/scanvf/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/scanvf/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/scanvf/src/ScanVF.kt b/src/fr/scanvf/src/eu/kanade/tachiyomi/extension/fr/scanvf/ScanVF.kt
similarity index 100%
rename from multisrc/overrides/mmrcms/scanvf/src/ScanVF.kt
rename to src/fr/scanvf/src/eu/kanade/tachiyomi/extension/fr/scanvf/ScanVF.kt
diff --git a/src/fr/shadowtrad/build.gradle b/src/fr/shadowtrad/build.gradle
new file mode 100644
index 000000000..f3d247181
--- /dev/null
+++ b/src/fr/shadowtrad/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Shadowtrad'
+ extClass = '.Shadowtrad'
+ themePkg = 'madara'
+ baseUrl = 'https://shadowtrad.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/shadowtrad/res/mipmap-hdpi/ic_launcher.png b/src/fr/shadowtrad/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shadowtrad/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/shadowtrad/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shadowtrad/res/mipmap-mdpi/ic_launcher.png b/src/fr/shadowtrad/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shadowtrad/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/shadowtrad/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shadowtrad/res/mipmap-xhdpi/ic_launcher.png b/src/fr/shadowtrad/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shadowtrad/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/shadowtrad/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shadowtrad/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/shadowtrad/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shadowtrad/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/shadowtrad/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shadowtrad/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/shadowtrad/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shadowtrad/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/shadowtrad/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shadowtrad/src/Shadowtrad.kt b/src/fr/shadowtrad/src/eu/kanade/tachiyomi/extension/fr/shadowtrad/Shadowtrad.kt
similarity index 100%
rename from multisrc/overrides/madara/shadowtrad/src/Shadowtrad.kt
rename to src/fr/shadowtrad/src/eu/kanade/tachiyomi/extension/fr/shadowtrad/Shadowtrad.kt
diff --git a/src/fr/sushiscan/build.gradle b/src/fr/sushiscan/build.gradle
new file mode 100644
index 000000000..b38650f60
--- /dev/null
+++ b/src/fr/sushiscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sushi-Scan'
+ extClass = '.SushiScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://sushiscan.net'
+ overrideVersionCode = 11
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/sushiscan/res/mipmap-hdpi/ic_launcher.png b/src/fr/sushiscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sushiscan/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/sushiscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sushiscan/res/mipmap-mdpi/ic_launcher.png b/src/fr/sushiscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sushiscan/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/sushiscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sushiscan/res/mipmap-xhdpi/ic_launcher.png b/src/fr/sushiscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sushiscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/sushiscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sushiscan/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/sushiscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sushiscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/sushiscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sushiscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/sushiscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sushiscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/sushiscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sushiscan/src/SushiScan.kt b/src/fr/sushiscan/src/eu/kanade/tachiyomi/extension/fr/sushiscan/SushiScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/sushiscan/src/SushiScan.kt
rename to src/fr/sushiscan/src/eu/kanade/tachiyomi/extension/fr/sushiscan/SushiScan.kt
diff --git a/src/fr/sushiscanfr/build.gradle b/src/fr/sushiscanfr/build.gradle
new file mode 100644
index 000000000..febc6fe54
--- /dev/null
+++ b/src/fr/sushiscanfr/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sushiscan.fr'
+ extClass = '.SushiScanFR'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://sushiscan.fr'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/sushiscanfr/res/mipmap-hdpi/ic_launcher.png b/src/fr/sushiscanfr/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sushiscanfr/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/sushiscanfr/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sushiscanfr/res/mipmap-mdpi/ic_launcher.png b/src/fr/sushiscanfr/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sushiscanfr/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/sushiscanfr/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sushiscanfr/res/mipmap-xhdpi/ic_launcher.png b/src/fr/sushiscanfr/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sushiscanfr/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/sushiscanfr/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sushiscanfr/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/sushiscanfr/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sushiscanfr/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/sushiscanfr/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sushiscanfr/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/sushiscanfr/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sushiscanfr/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/sushiscanfr/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sushiscanfr/src/SushiScanFR.kt b/src/fr/sushiscanfr/src/eu/kanade/tachiyomi/extension/fr/sushiscanfr/SushiScanFR.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/sushiscanfr/src/SushiScanFR.kt
rename to src/fr/sushiscanfr/src/eu/kanade/tachiyomi/extension/fr/sushiscanfr/SushiScanFR.kt
diff --git a/src/fr/thebeginningaftertheend/build.gradle b/src/fr/thebeginningaftertheend/build.gradle
new file mode 100644
index 000000000..eeadb6aae
--- /dev/null
+++ b/src/fr/thebeginningaftertheend/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'The Beginning After The End'
+ extClass = '.TheBeginningAfterTheEnd'
+ themePkg = 'madara'
+ baseUrl = 'https://www.thebeginningaftertheend.fr'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/thebeginningaftertheend/res/mipmap-hdpi/ic_launcher.png b/src/fr/thebeginningaftertheend/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/thebeginningaftertheend/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/thebeginningaftertheend/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/thebeginningaftertheend/res/mipmap-mdpi/ic_launcher.png b/src/fr/thebeginningaftertheend/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/thebeginningaftertheend/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/thebeginningaftertheend/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/thebeginningaftertheend/res/mipmap-xhdpi/ic_launcher.png b/src/fr/thebeginningaftertheend/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/thebeginningaftertheend/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/thebeginningaftertheend/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/thebeginningaftertheend/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/thebeginningaftertheend/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/thebeginningaftertheend/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/thebeginningaftertheend/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/thebeginningaftertheend/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/thebeginningaftertheend/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/thebeginningaftertheend/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/thebeginningaftertheend/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/thebeginningaftertheend/src/TheBeginningAfterTheEnd.kt b/src/fr/thebeginningaftertheend/src/eu/kanade/tachiyomi/extension/fr/thebeginningaftertheend/TheBeginningAfterTheEnd.kt
similarity index 100%
rename from multisrc/overrides/madara/thebeginningaftertheend/src/TheBeginningAfterTheEnd.kt
rename to src/fr/thebeginningaftertheend/src/eu/kanade/tachiyomi/extension/fr/thebeginningaftertheend/TheBeginningAfterTheEnd.kt
diff --git a/src/fr/vfscan/build.gradle b/src/fr/vfscan/build.gradle
new file mode 100644
index 000000000..f70a2ebc7
--- /dev/null
+++ b/src/fr/vfscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'VF Scan'
+ extClass = '.VFScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://www.vfscan.cc'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/vfscan/res/mipmap-hdpi/ic_launcher.png b/src/fr/vfscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/vfscan/res/mipmap-hdpi/ic_launcher.png
rename to src/fr/vfscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/vfscan/res/mipmap-mdpi/ic_launcher.png b/src/fr/vfscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/vfscan/res/mipmap-mdpi/ic_launcher.png
rename to src/fr/vfscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/vfscan/res/mipmap-xhdpi/ic_launcher.png b/src/fr/vfscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/vfscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/fr/vfscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/vfscan/res/mipmap-xxhdpi/ic_launcher.png b/src/fr/vfscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/vfscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/fr/vfscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/vfscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/fr/vfscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/vfscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/fr/vfscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/vfscan/src/VFScan.kt b/src/fr/vfscan/src/eu/kanade/tachiyomi/extension/fr/vfscan/VFScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/vfscan/src/VFScan.kt
rename to src/fr/vfscan/src/eu/kanade/tachiyomi/extension/fr/vfscan/VFScan.kt
diff --git a/src/hi/comicsvalley/build.gradle b/src/hi/comicsvalley/build.gradle
new file mode 100644
index 000000000..ad9277f73
--- /dev/null
+++ b/src/hi/comicsvalley/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Comics Valley'
+ extClass = '.ComicsValley'
+ themePkg = 'madara'
+ baseUrl = 'https://comicsvalley.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/comicsvalley/res/mipmap-hdpi/ic_launcher.png b/src/hi/comicsvalley/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicsvalley/res/mipmap-hdpi/ic_launcher.png
rename to src/hi/comicsvalley/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicsvalley/res/mipmap-mdpi/ic_launcher.png b/src/hi/comicsvalley/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicsvalley/res/mipmap-mdpi/ic_launcher.png
rename to src/hi/comicsvalley/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicsvalley/res/mipmap-xhdpi/ic_launcher.png b/src/hi/comicsvalley/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicsvalley/res/mipmap-xhdpi/ic_launcher.png
rename to src/hi/comicsvalley/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicsvalley/res/mipmap-xxhdpi/ic_launcher.png b/src/hi/comicsvalley/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicsvalley/res/mipmap-xxhdpi/ic_launcher.png
rename to src/hi/comicsvalley/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicsvalley/res/mipmap-xxxhdpi/ic_launcher.png b/src/hi/comicsvalley/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicsvalley/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/hi/comicsvalley/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/hi/comicsvalley/src/eu/kanade/tachiyomi/extension/hi/comicsvalley/ComicsValley.kt b/src/hi/comicsvalley/src/eu/kanade/tachiyomi/extension/hi/comicsvalley/ComicsValley.kt
new file mode 100644
index 000000000..62414c230
--- /dev/null
+++ b/src/hi/comicsvalley/src/eu/kanade/tachiyomi/extension/hi/comicsvalley/ComicsValley.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.hi.comicsvalley
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class ComicsValley : Madara("Comics Valley", "https://comicsvalley.com", "hi")
diff --git a/src/hi/comicsworld/build.gradle b/src/hi/comicsworld/build.gradle
new file mode 100644
index 000000000..239da2ae8
--- /dev/null
+++ b/src/hi/comicsworld/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ComicsWorld'
+ extClass = '.ComicsWorld'
+ themePkg = 'madara'
+ baseUrl = 'https://comicsworld.in'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/comicsworld/res/mipmap-hdpi/ic_launcher.png b/src/hi/comicsworld/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicsworld/res/mipmap-hdpi/ic_launcher.png
rename to src/hi/comicsworld/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicsworld/res/mipmap-mdpi/ic_launcher.png b/src/hi/comicsworld/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicsworld/res/mipmap-mdpi/ic_launcher.png
rename to src/hi/comicsworld/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicsworld/res/mipmap-xhdpi/ic_launcher.png b/src/hi/comicsworld/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicsworld/res/mipmap-xhdpi/ic_launcher.png
rename to src/hi/comicsworld/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicsworld/res/mipmap-xxhdpi/ic_launcher.png b/src/hi/comicsworld/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicsworld/res/mipmap-xxhdpi/ic_launcher.png
rename to src/hi/comicsworld/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/comicsworld/res/mipmap-xxxhdpi/ic_launcher.png b/src/hi/comicsworld/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/comicsworld/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/hi/comicsworld/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/hi/comicsworld/src/eu/kanade/tachiyomi/extension/hi/comicsworld/ComicsWorld.kt b/src/hi/comicsworld/src/eu/kanade/tachiyomi/extension/hi/comicsworld/ComicsWorld.kt
new file mode 100644
index 000000000..5107b79eb
--- /dev/null
+++ b/src/hi/comicsworld/src/eu/kanade/tachiyomi/extension/hi/comicsworld/ComicsWorld.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.hi.comicsworld
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class ComicsWorld : Madara("ComicsWorld", "https://comicsworld.in", "hi")
diff --git a/src/id/ainzscansid/build.gradle b/src/id/ainzscansid/build.gradle
new file mode 100644
index 000000000..724fc55c5
--- /dev/null
+++ b/src/id/ainzscansid/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Ainz Scans ID'
+ extClass = '.AinzScansID'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://ainzscans.net'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/ainzscansid/res/mipmap-hdpi/ic_launcher.png b/src/id/ainzscansid/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ainzscansid/res/mipmap-hdpi/ic_launcher.png
rename to src/id/ainzscansid/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ainzscansid/res/mipmap-mdpi/ic_launcher.png b/src/id/ainzscansid/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ainzscansid/res/mipmap-mdpi/ic_launcher.png
rename to src/id/ainzscansid/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ainzscansid/res/mipmap-xhdpi/ic_launcher.png b/src/id/ainzscansid/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ainzscansid/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/ainzscansid/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ainzscansid/res/mipmap-xxhdpi/ic_launcher.png b/src/id/ainzscansid/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ainzscansid/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/ainzscansid/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ainzscansid/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/ainzscansid/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ainzscansid/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/ainzscansid/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ainzscansid/src/AinzScansID.kt b/src/id/ainzscansid/src/eu/kanade/tachiyomi/extension/id/ainzscansid/AinzScansID.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/ainzscansid/src/AinzScansID.kt
rename to src/id/ainzscansid/src/eu/kanade/tachiyomi/extension/id/ainzscansid/AinzScansID.kt
diff --git a/src/id/alceascan/build.gradle b/src/id/alceascan/build.gradle
new file mode 100644
index 000000000..f1bcd13d5
--- /dev/null
+++ b/src/id/alceascan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Alceascan'
+ extClass = '.Alceascan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://alceascan.my.id'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/alceascan/res/mipmap-hdpi/ic_launcher.png b/src/id/alceascan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/alceascan/res/mipmap-hdpi/ic_launcher.png
rename to src/id/alceascan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/alceascan/res/mipmap-mdpi/ic_launcher.png b/src/id/alceascan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/alceascan/res/mipmap-mdpi/ic_launcher.png
rename to src/id/alceascan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/alceascan/res/mipmap-xhdpi/ic_launcher.png b/src/id/alceascan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/alceascan/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/alceascan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/alceascan/res/mipmap-xxhdpi/ic_launcher.png b/src/id/alceascan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/alceascan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/alceascan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/alceascan/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/alceascan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/alceascan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/alceascan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/alceascan/src/Alceascan.kt b/src/id/alceascan/src/eu/kanade/tachiyomi/extension/id/alceascan/Alceascan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/alceascan/src/Alceascan.kt
rename to src/id/alceascan/src/eu/kanade/tachiyomi/extension/id/alceascan/Alceascan.kt
diff --git a/src/id/birdtoon/build.gradle b/src/id/birdtoon/build.gradle
new file mode 100644
index 000000000..9f2394eb6
--- /dev/null
+++ b/src/id/birdtoon/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'BirdToon'
+ extClass = '.BirdToon'
+ themePkg = 'madara'
+ baseUrl = 'https://birdtoon.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/birdtoon/res/mipmap-hdpi/ic_launcher.png b/src/id/birdtoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/birdtoon/res/mipmap-hdpi/ic_launcher.png
rename to src/id/birdtoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/birdtoon/res/mipmap-mdpi/ic_launcher.png b/src/id/birdtoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/birdtoon/res/mipmap-mdpi/ic_launcher.png
rename to src/id/birdtoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/birdtoon/res/mipmap-xhdpi/ic_launcher.png b/src/id/birdtoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/birdtoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/birdtoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/birdtoon/res/mipmap-xxhdpi/ic_launcher.png b/src/id/birdtoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/birdtoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/birdtoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/birdtoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/birdtoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/birdtoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/birdtoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/birdtoon/src/BirdToon.kt b/src/id/birdtoon/src/eu/kanade/tachiyomi/extension/id/birdtoon/BirdToon.kt
similarity index 100%
rename from multisrc/overrides/madara/birdtoon/src/BirdToon.kt
rename to src/id/birdtoon/src/eu/kanade/tachiyomi/extension/id/birdtoon/BirdToon.kt
diff --git a/src/id/boosei/build.gradle b/src/id/boosei/build.gradle
new file mode 100644
index 000000000..190fc1e1f
--- /dev/null
+++ b/src/id/boosei/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Boosei'
+ extClass = '.Boosei'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://boosei.net'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/boosei/res/mipmap-hdpi/ic_launcher.png b/src/id/boosei/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/boosei/res/mipmap-hdpi/ic_launcher.png
rename to src/id/boosei/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/boosei/res/mipmap-mdpi/ic_launcher.png b/src/id/boosei/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/boosei/res/mipmap-mdpi/ic_launcher.png
rename to src/id/boosei/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/boosei/res/mipmap-xhdpi/ic_launcher.png b/src/id/boosei/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/boosei/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/boosei/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/boosei/res/mipmap-xxhdpi/ic_launcher.png b/src/id/boosei/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/boosei/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/boosei/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/boosei/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/boosei/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/boosei/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/boosei/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/boosei/src/Boosei.kt b/src/id/boosei/src/eu/kanade/tachiyomi/extension/id/boosei/Boosei.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/boosei/src/Boosei.kt
rename to src/id/boosei/src/eu/kanade/tachiyomi/extension/id/boosei/Boosei.kt
diff --git a/src/id/comicaso/build.gradle b/src/id/comicaso/build.gradle
new file mode 100644
index 000000000..288c2e375
--- /dev/null
+++ b/src/id/comicaso/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Comicaso'
+ extClass = '.Comicaso'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://comicaso.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/comicaso/res/mipmap-hdpi/ic_launcher.png b/src/id/comicaso/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/comicaso/res/mipmap-hdpi/ic_launcher.png
rename to src/id/comicaso/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/comicaso/res/mipmap-mdpi/ic_launcher.png b/src/id/comicaso/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/comicaso/res/mipmap-mdpi/ic_launcher.png
rename to src/id/comicaso/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/comicaso/res/mipmap-xhdpi/ic_launcher.png b/src/id/comicaso/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/comicaso/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/comicaso/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/comicaso/res/mipmap-xxhdpi/ic_launcher.png b/src/id/comicaso/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/comicaso/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/comicaso/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/comicaso/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/comicaso/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/comicaso/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/comicaso/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/comicaso/src/Comicaso.kt b/src/id/comicaso/src/eu/kanade/tachiyomi/extension/id/comicaso/Comicaso.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/comicaso/src/Comicaso.kt
rename to src/id/comicaso/src/eu/kanade/tachiyomi/extension/id/comicaso/Comicaso.kt
diff --git a/src/id/comicsekai/build.gradle b/src/id/comicsekai/build.gradle
new file mode 100644
index 000000000..964ea3fad
--- /dev/null
+++ b/src/id/comicsekai/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Comicsekai'
+ extClass = '.Comicsekai'
+ themePkg = 'mangathemesia'
+ baseUrl = 'http://www.comicsekai.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/comicsekai/src/Comicsekai.kt b/src/id/comicsekai/src/eu/kanade/tachiyomi/extension/id/comicsekai/Comicsekai.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/comicsekai/src/Comicsekai.kt
rename to src/id/comicsekai/src/eu/kanade/tachiyomi/extension/id/comicsekai/Comicsekai.kt
diff --git a/src/id/cosmicscansid/build.gradle b/src/id/cosmicscansid/build.gradle
new file mode 100644
index 000000000..66ba537fe
--- /dev/null
+++ b/src/id/cosmicscansid/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'CosmicScans.id'
+ extClass = '.CosmicScansID'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://cosmicscans.id'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/cosmicscansid/res/mipmap-hdpi/ic_launcher.png b/src/id/cosmicscansid/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cosmicscansid/res/mipmap-hdpi/ic_launcher.png
rename to src/id/cosmicscansid/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cosmicscansid/res/mipmap-mdpi/ic_launcher.png b/src/id/cosmicscansid/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cosmicscansid/res/mipmap-mdpi/ic_launcher.png
rename to src/id/cosmicscansid/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cosmicscansid/res/mipmap-xhdpi/ic_launcher.png b/src/id/cosmicscansid/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cosmicscansid/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/cosmicscansid/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cosmicscansid/res/mipmap-xxhdpi/ic_launcher.png b/src/id/cosmicscansid/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cosmicscansid/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/cosmicscansid/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cosmicscansid/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/cosmicscansid/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/cosmicscansid/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/cosmicscansid/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/cosmicscansid/src/CosmicScansID.kt b/src/id/cosmicscansid/src/eu/kanade/tachiyomi/extension/id/cosmicscansid/CosmicScansID.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/cosmicscansid/src/CosmicScansID.kt
rename to src/id/cosmicscansid/src/eu/kanade/tachiyomi/extension/id/cosmicscansid/CosmicScansID.kt
diff --git a/src/id/dojingnet/build.gradle b/src/id/dojingnet/build.gradle
new file mode 100644
index 000000000..2f63ded81
--- /dev/null
+++ b/src/id/dojingnet/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Dojing.net'
+ extClass = '.DojingNet'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://dojing.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/dojingnet/res/mipmap-hdpi/ic_launcher.png b/src/id/dojingnet/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/dojingnet/res/mipmap-hdpi/ic_launcher.png
rename to src/id/dojingnet/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/dojingnet/res/mipmap-mdpi/ic_launcher.png b/src/id/dojingnet/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/dojingnet/res/mipmap-mdpi/ic_launcher.png
rename to src/id/dojingnet/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/dojingnet/res/mipmap-xhdpi/ic_launcher.png b/src/id/dojingnet/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/dojingnet/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/dojingnet/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/dojingnet/res/mipmap-xxhdpi/ic_launcher.png b/src/id/dojingnet/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/dojingnet/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/dojingnet/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/dojingnet/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/dojingnet/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/dojingnet/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/dojingnet/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/dojingnet/src/DojingNet.kt b/src/id/dojingnet/src/eu/kanade/tachiyomi/extension/id/dojingnet/DojingNet.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/dojingnet/src/DojingNet.kt
rename to src/id/dojingnet/src/eu/kanade/tachiyomi/extension/id/dojingnet/DojingNet.kt
diff --git a/src/id/hensekai/build.gradle b/src/id/hensekai/build.gradle
new file mode 100644
index 000000000..2147129a0
--- /dev/null
+++ b/src/id/hensekai/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hensekai'
+ extClass = '.Hensekai'
+ themePkg = 'zmanga'
+ baseUrl = 'https://hensekai.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zmanga/hensekai/res/mipmap-hdpi/ic_launcher.png b/src/id/hensekai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/hensekai/res/mipmap-hdpi/ic_launcher.png
rename to src/id/hensekai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/hensekai/res/mipmap-mdpi/ic_launcher.png b/src/id/hensekai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/hensekai/res/mipmap-mdpi/ic_launcher.png
rename to src/id/hensekai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/hensekai/res/mipmap-xhdpi/ic_launcher.png b/src/id/hensekai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/hensekai/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/hensekai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/hensekai/res/mipmap-xxhdpi/ic_launcher.png b/src/id/hensekai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/hensekai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/hensekai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/hensekai/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/hensekai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/hensekai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/hensekai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/hensekai/src/Hensekai.kt b/src/id/hensekai/src/eu/kanade/tachiyomi/extension/id/hensekai/Hensekai.kt
similarity index 100%
rename from multisrc/overrides/zmanga/hensekai/src/Hensekai.kt
rename to src/id/hensekai/src/eu/kanade/tachiyomi/extension/id/hensekai/Hensekai.kt
diff --git a/src/id/heroxia/build.gradle b/src/id/heroxia/build.gradle
new file mode 100644
index 000000000..9f060fee5
--- /dev/null
+++ b/src/id/heroxia/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Heroxia'
+ extClass = '.Heroxia'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://heroxia.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/heroxia/res/mipmap-hdpi/ic_launcher.png b/src/id/heroxia/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/heroxia/res/mipmap-hdpi/ic_launcher.png
rename to src/id/heroxia/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/heroxia/res/mipmap-mdpi/ic_launcher.png b/src/id/heroxia/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/heroxia/res/mipmap-mdpi/ic_launcher.png
rename to src/id/heroxia/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/heroxia/res/mipmap-xhdpi/ic_launcher.png b/src/id/heroxia/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/heroxia/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/heroxia/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/heroxia/res/mipmap-xxhdpi/ic_launcher.png b/src/id/heroxia/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/heroxia/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/heroxia/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/heroxia/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/heroxia/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/heroxia/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/heroxia/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/id/heroxia/src/eu/kanade/tachiyomi/extension/id/heroxia/Heroxia.kt b/src/id/heroxia/src/eu/kanade/tachiyomi/extension/id/heroxia/Heroxia.kt
new file mode 100644
index 000000000..34dbc092b
--- /dev/null
+++ b/src/id/heroxia/src/eu/kanade/tachiyomi/extension/id/heroxia/Heroxia.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.id.heroxia
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class Heroxia : MangaThemesia("Heroxia", "https://heroxia.com", "id")
diff --git a/src/id/inazumanga/build.gradle b/src/id/inazumanga/build.gradle
new file mode 100644
index 000000000..6be96f3b0
--- /dev/null
+++ b/src/id/inazumanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ReYume'
+ extClass = '.ReYume'
+ themePkg = 'makaru'
+ baseUrl = 'https://www.re-yume.my.id'
+ overrideVersionCode = 34
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/makaru/inazumanga/res/mipmap-hdpi/ic_launcher.png b/src/id/inazumanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/inazumanga/res/mipmap-hdpi/ic_launcher.png
rename to src/id/inazumanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/makaru/inazumanga/res/mipmap-mdpi/ic_launcher.png b/src/id/inazumanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/inazumanga/res/mipmap-mdpi/ic_launcher.png
rename to src/id/inazumanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/makaru/inazumanga/res/mipmap-xhdpi/ic_launcher.png b/src/id/inazumanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/inazumanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/inazumanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/makaru/inazumanga/res/mipmap-xxhdpi/ic_launcher.png b/src/id/inazumanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/inazumanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/inazumanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/makaru/inazumanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/inazumanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/inazumanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/inazumanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/id/inazumanga/src/eu/kanade/tachiyomi/extension/id/inazumanga/ReYume.kt b/src/id/inazumanga/src/eu/kanade/tachiyomi/extension/id/inazumanga/ReYume.kt
new file mode 100644
index 000000000..b7de1b423
--- /dev/null
+++ b/src/id/inazumanga/src/eu/kanade/tachiyomi/extension/id/inazumanga/ReYume.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.id.inazumanga
+
+import eu.kanade.tachiyomi.multisrc.makaru.Makaru
+
+class ReYume : Makaru("ReYume", "https://www.re-yume.my.id", "id")
diff --git a/src/id/kanzenin/build.gradle b/src/id/kanzenin/build.gradle
new file mode 100644
index 000000000..db043aae5
--- /dev/null
+++ b/src/id/kanzenin/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Kanzenin'
+ extClass = '.Kanzenin'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://kanzenin.info'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/kanzenin/src/Kanzenin.kt b/src/id/kanzenin/src/eu/kanade/tachiyomi/extension/id/kanzenin/Kanzenin.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/kanzenin/src/Kanzenin.kt
rename to src/id/kanzenin/src/eu/kanade/tachiyomi/extension/id/kanzenin/Kanzenin.kt
diff --git a/src/id/katakomik/build.gradle b/src/id/katakomik/build.gradle
new file mode 100644
index 000000000..523ab000b
--- /dev/null
+++ b/src/id/katakomik/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'KataKomik'
+ extClass = '.KataKomik'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://katakomik.my.id'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/katakomik/res/mipmap-hdpi/ic_launcher.png b/src/id/katakomik/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/katakomik/res/mipmap-hdpi/ic_launcher.png
rename to src/id/katakomik/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/katakomik/res/mipmap-mdpi/ic_launcher.png b/src/id/katakomik/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/katakomik/res/mipmap-mdpi/ic_launcher.png
rename to src/id/katakomik/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/katakomik/res/mipmap-xhdpi/ic_launcher.png b/src/id/katakomik/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/katakomik/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/katakomik/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/katakomik/res/mipmap-xxhdpi/ic_launcher.png b/src/id/katakomik/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/katakomik/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/katakomik/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/katakomik/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/katakomik/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/katakomik/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/katakomik/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/id/katakomik/src/eu/kanade/tachiyomi/extension/id/katakomik/KataKomik.kt b/src/id/katakomik/src/eu/kanade/tachiyomi/extension/id/katakomik/KataKomik.kt
new file mode 100644
index 000000000..eb14d3b3f
--- /dev/null
+++ b/src/id/katakomik/src/eu/kanade/tachiyomi/extension/id/katakomik/KataKomik.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.id.katakomik
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class KataKomik : MangaThemesia("KataKomik", "https://katakomik.my.id", "id")
diff --git a/src/id/kiryuu/build.gradle b/src/id/kiryuu/build.gradle
new file mode 100644
index 000000000..1416586d5
--- /dev/null
+++ b/src/id/kiryuu/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Kiryuu'
+ extClass = '.Kiryuu'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://kiryuu.id'
+ overrideVersionCode = 6
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/kiryuu/res/mipmap-hdpi/ic_launcher.png b/src/id/kiryuu/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kiryuu/res/mipmap-hdpi/ic_launcher.png
rename to src/id/kiryuu/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kiryuu/res/mipmap-mdpi/ic_launcher.png b/src/id/kiryuu/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kiryuu/res/mipmap-mdpi/ic_launcher.png
rename to src/id/kiryuu/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kiryuu/res/mipmap-xhdpi/ic_launcher.png b/src/id/kiryuu/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kiryuu/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/kiryuu/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kiryuu/res/mipmap-xxhdpi/ic_launcher.png b/src/id/kiryuu/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kiryuu/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/kiryuu/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kiryuu/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/kiryuu/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kiryuu/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/kiryuu/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kiryuu/src/Kiryuu.kt b/src/id/kiryuu/src/eu/kanade/tachiyomi/extension/id/kiryuu/Kiryuu.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/kiryuu/src/Kiryuu.kt
rename to src/id/kiryuu/src/eu/kanade/tachiyomi/extension/id/kiryuu/Kiryuu.kt
diff --git a/src/id/klikmanga/build.gradle b/src/id/klikmanga/build.gradle
new file mode 100644
index 000000000..c358a9c95
--- /dev/null
+++ b/src/id/klikmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'KlikManga'
+ extClass = '.KlikManga'
+ themePkg = 'madara'
+ baseUrl = 'https://klikmanga.id'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/klikmanga/res/mipmap-hdpi/ic_launcher.png b/src/id/klikmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/klikmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/id/klikmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/klikmanga/res/mipmap-mdpi/ic_launcher.png b/src/id/klikmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/klikmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/id/klikmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/klikmanga/res/mipmap-xhdpi/ic_launcher.png b/src/id/klikmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/klikmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/klikmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/klikmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/id/klikmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/klikmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/klikmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/klikmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/klikmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/klikmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/klikmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/klikmanga/src/KlikManga.kt b/src/id/klikmanga/src/eu/kanade/tachiyomi/extension/id/klikmanga/KlikManga.kt
similarity index 100%
rename from multisrc/overrides/madara/klikmanga/src/KlikManga.kt
rename to src/id/klikmanga/src/eu/kanade/tachiyomi/extension/id/klikmanga/KlikManga.kt
diff --git a/src/id/klmanhua/build.gradle b/src/id/klmanhua/build.gradle
new file mode 100644
index 000000000..9b435f89a
--- /dev/null
+++ b/src/id/klmanhua/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'KLManhua'
+ extClass = '.KLManhua'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://klmanhua.blogspot.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/klmanhua/res/mipmap-hdpi/ic_launcher.png b/src/id/klmanhua/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/klmanhua/res/mipmap-hdpi/ic_launcher.png
rename to src/id/klmanhua/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/klmanhua/res/mipmap-mdpi/ic_launcher.png b/src/id/klmanhua/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/klmanhua/res/mipmap-mdpi/ic_launcher.png
rename to src/id/klmanhua/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/klmanhua/res/mipmap-xhdpi/ic_launcher.png b/src/id/klmanhua/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/klmanhua/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/klmanhua/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/klmanhua/res/mipmap-xxhdpi/ic_launcher.png b/src/id/klmanhua/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/klmanhua/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/klmanhua/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/klmanhua/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/klmanhua/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/klmanhua/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/klmanhua/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/klmanhua/src/KLManhua.kt b/src/id/klmanhua/src/eu/kanade/tachiyomi/extension/id/klmanhua/KLManhua.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/klmanhua/src/KLManhua.kt
rename to src/id/klmanhua/src/eu/kanade/tachiyomi/extension/id/klmanhua/KLManhua.kt
diff --git a/src/id/komikav/build.gradle b/src/id/komikav/build.gradle
new file mode 100644
index 000000000..5812487b5
--- /dev/null
+++ b/src/id/komikav/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Komik AV'
+ extClass = '.KomikAV'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://komikav.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/komikav/res/mipmap-hdpi/ic_launcher.png b/src/id/komikav/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikav/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikav/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikav/res/mipmap-mdpi/ic_launcher.png b/src/id/komikav/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikav/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikav/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikav/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikav/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikav/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikav/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikav/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikav/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikav/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikav/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikav/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikav/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikav/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikav/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikav/src/KomikAV.kt b/src/id/komikav/src/eu/kanade/tachiyomi/extension/id/komikav/KomikAV.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikav/src/KomikAV.kt
rename to src/id/komikav/src/eu/kanade/tachiyomi/extension/id/komikav/KomikAV.kt
diff --git a/src/id/komikcast/build.gradle b/src/id/komikcast/build.gradle
new file mode 100644
index 000000000..e66e189d4
--- /dev/null
+++ b/src/id/komikcast/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Komik Cast'
+ extClass = '.KomikCast'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://komikcast.lol'
+ overrideVersionCode = 26
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/komikcast/res/mipmap-hdpi/ic_launcher.png b/src/id/komikcast/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikcast/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikcast/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikcast/res/mipmap-mdpi/ic_launcher.png b/src/id/komikcast/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikcast/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikcast/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikcast/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikcast/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikcast/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikcast/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikcast/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikcast/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikcast/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikcast/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikcast/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikcast/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikcast/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikcast/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikcast/src/KomikCast.kt b/src/id/komikcast/src/eu/kanade/tachiyomi/extension/id/komikcast/KomikCast.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikcast/src/KomikCast.kt
rename to src/id/komikcast/src/eu/kanade/tachiyomi/extension/id/komikcast/KomikCast.kt
diff --git a/src/id/komikgan/build.gradle b/src/id/komikgan/build.gradle
new file mode 100644
index 000000000..2efa27c90
--- /dev/null
+++ b/src/id/komikgan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'KomikGan'
+ extClass = '.KomikGan'
+ themePkg = 'zmanga'
+ baseUrl = 'https://komikgan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zmanga/komikgan/res/mipmap-hdpi/ic_launcher.png b/src/id/komikgan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikgan/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikgan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikgan/res/mipmap-mdpi/ic_launcher.png b/src/id/komikgan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikgan/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikgan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikgan/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikgan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikgan/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikgan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikgan/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikgan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikgan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikgan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikgan/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikgan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikgan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikgan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikgan/src/KomikGan.kt b/src/id/komikgan/src/eu/kanade/tachiyomi/extension/id/komikgan/KomikGan.kt
similarity index 100%
rename from multisrc/overrides/zmanga/komikgan/src/KomikGan.kt
rename to src/id/komikgan/src/eu/kanade/tachiyomi/extension/id/komikgan/KomikGan.kt
diff --git a/src/id/komikges/build.gradle b/src/id/komikges/build.gradle
new file mode 100644
index 000000000..3792267ab
--- /dev/null
+++ b/src/id/komikges/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'KomikGes'
+ extClass = '.KomikGes'
+ themePkg = 'makaru'
+ baseUrl = 'https://www.komikges.my.id'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/makaru/komikges/res/mipmap-hdpi/ic_launcher.png b/src/id/komikges/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/komikges/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikges/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/makaru/komikges/res/mipmap-mdpi/ic_launcher.png b/src/id/komikges/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/komikges/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikges/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/makaru/komikges/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikges/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/komikges/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikges/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/makaru/komikges/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikges/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/komikges/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikges/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/makaru/komikges/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikges/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/komikges/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikges/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/id/komikges/src/eu/kanade/tachiyomi/extension/id/komikges/KomikGes.kt b/src/id/komikges/src/eu/kanade/tachiyomi/extension/id/komikges/KomikGes.kt
new file mode 100644
index 000000000..2981dedcf
--- /dev/null
+++ b/src/id/komikges/src/eu/kanade/tachiyomi/extension/id/komikges/KomikGes.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.id.komikges
+
+import eu.kanade.tachiyomi.multisrc.makaru.Makaru
+
+class KomikGes : Makaru("KomikGes", "https://www.komikges.my.id", "id")
diff --git a/src/id/komikgue/build.gradle b/src/id/komikgue/build.gradle
new file mode 100644
index 000000000..a017a0e66
--- /dev/null
+++ b/src/id/komikgue/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Komik Gue'
+ extClass = '.KomikGue'
+ themePkg = 'madara'
+ baseUrl = 'https://komikgue.pro'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/komikgue/res/mipmap-hdpi/ic_launcher.png b/src/id/komikgue/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/komikgue/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikgue/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/komikgue/res/mipmap-mdpi/ic_launcher.png b/src/id/komikgue/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/komikgue/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikgue/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/komikgue/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikgue/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/komikgue/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikgue/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/komikgue/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikgue/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/komikgue/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikgue/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/komikgue/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikgue/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/komikgue/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikgue/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/komikgue/src/KomikGue.kt b/src/id/komikgue/src/eu/kanade/tachiyomi/extension/id/komikgue/KomikGue.kt
similarity index 100%
rename from multisrc/overrides/madara/komikgue/src/KomikGue.kt
rename to src/id/komikgue/src/eu/kanade/tachiyomi/extension/id/komikgue/KomikGue.kt
diff --git a/src/id/komikid/build.gradle b/src/id/komikid/build.gradle
new file mode 100644
index 000000000..b54287ef1
--- /dev/null
+++ b/src/id/komikid/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Komikid'
+ extClass = '.Komikid'
+ themePkg = 'mmrcms'
+ baseUrl = 'https://www.komikid.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mmrcms/komikid/src/Komikid.kt b/src/id/komikid/src/eu/kanade/tachiyomi/extension/id/komikid/Komikid.kt
similarity index 100%
rename from multisrc/overrides/mmrcms/komikid/src/Komikid.kt
rename to src/id/komikid/src/eu/kanade/tachiyomi/extension/id/komikid/Komikid.kt
diff --git a/src/id/komikindoco/build.gradle b/src/id/komikindoco/build.gradle
new file mode 100644
index 000000000..e15b92ba7
--- /dev/null
+++ b/src/id/komikindoco/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'KomikIndo.co'
+ extClass = '.KomikindoCo'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://komikindo.co'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/komikindoco/res/mipmap-hdpi/ic_launcher.png b/src/id/komikindoco/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikindoco/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikindoco/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikindoco/res/mipmap-mdpi/ic_launcher.png b/src/id/komikindoco/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikindoco/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikindoco/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikindoco/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikindoco/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikindoco/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikindoco/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikindoco/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikindoco/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikindoco/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikindoco/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikindoco/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikindoco/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikindoco/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikindoco/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikindoco/src/KomikindoCo.kt b/src/id/komikindoco/src/eu/kanade/tachiyomi/extension/id/komikindoco/KomikindoCo.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikindoco/src/KomikindoCo.kt
rename to src/id/komikindoco/src/eu/kanade/tachiyomi/extension/id/komikindoco/KomikindoCo.kt
diff --git a/src/id/komikindoinfo/build.gradle b/src/id/komikindoinfo/build.gradle
new file mode 100644
index 000000000..f246261a3
--- /dev/null
+++ b/src/id/komikindoinfo/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'KomikIndo.info'
+ extClass = '.KomikIndoInfo'
+ themePkg = 'zmanga'
+ baseUrl = 'http://komikindo.info'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zmanga/komikindoinfo/res/mipmap-hdpi/ic_launcher.png b/src/id/komikindoinfo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikindoinfo/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikindoinfo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikindoinfo/res/mipmap-mdpi/ic_launcher.png b/src/id/komikindoinfo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikindoinfo/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikindoinfo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikindoinfo/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikindoinfo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikindoinfo/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikindoinfo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikindoinfo/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikindoinfo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikindoinfo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikindoinfo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikindoinfo/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikindoinfo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikindoinfo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikindoinfo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikindoinfo/src/KomikIndoInfo.kt b/src/id/komikindoinfo/src/eu/kanade/tachiyomi/extension/id/komikindoinfo/KomikIndoInfo.kt
similarity index 100%
rename from multisrc/overrides/zmanga/komikindoinfo/src/KomikIndoInfo.kt
rename to src/id/komikindoinfo/src/eu/kanade/tachiyomi/extension/id/komikindoinfo/KomikIndoInfo.kt
diff --git a/src/id/komikmama/build.gradle b/src/id/komikmama/build.gradle
new file mode 100644
index 000000000..7d69fbfe5
--- /dev/null
+++ b/src/id/komikmama/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'KomikMama'
+ extClass = '.KomikMama'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://komik-mama.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/komikmama/res/mipmap-hdpi/ic_launcher.png b/src/id/komikmama/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikmama/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikmama/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikmama/res/mipmap-mdpi/ic_launcher.png b/src/id/komikmama/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikmama/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikmama/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikmama/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikmama/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikmama/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikmama/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikmama/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikmama/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikmama/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikmama/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikmama/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikmama/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikmama/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikmama/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikmama/src/KomikMama.kt b/src/id/komikmama/src/eu/kanade/tachiyomi/extension/id/komikmama/KomikMama.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikmama/src/KomikMama.kt
rename to src/id/komikmama/src/eu/kanade/tachiyomi/extension/id/komikmama/KomikMama.kt
diff --git a/src/id/komikmanhwa/build.gradle b/src/id/komikmanhwa/build.gradle
new file mode 100644
index 000000000..993546c40
--- /dev/null
+++ b/src/id/komikmanhwa/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'KomikManhwa'
+ extClass = '.KomikManhwa'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://komikmanhwa.me'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/komikmanhwa/res/mipmap-hdpi/ic_launcher.png b/src/id/komikmanhwa/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikmanhwa/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikmanhwa/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikmanhwa/res/mipmap-mdpi/ic_launcher.png b/src/id/komikmanhwa/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikmanhwa/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikmanhwa/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikmanhwa/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikmanhwa/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikmanhwa/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikmanhwa/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikmanhwa/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikmanhwa/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikmanhwa/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikmanhwa/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikmanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikmanhwa/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikmanhwa/src/KomikManhwa.kt b/src/id/komikmanhwa/src/eu/kanade/tachiyomi/extension/id/komikmanhwa/KomikManhwa.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikmanhwa/src/KomikManhwa.kt
rename to src/id/komikmanhwa/src/eu/kanade/tachiyomi/extension/id/komikmanhwa/KomikManhwa.kt
diff --git a/src/id/komikplay/build.gradle b/src/id/komikplay/build.gradle
new file mode 100644
index 000000000..65702fe3d
--- /dev/null
+++ b/src/id/komikplay/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'KomikPlay'
+ extClass = '.KomikPlay'
+ themePkg = 'zmanga'
+ baseUrl = 'https://komikplay.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zmanga/komikplay/res/mipmap-hdpi/ic_launcher.png b/src/id/komikplay/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikplay/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikplay/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikplay/res/mipmap-mdpi/ic_launcher.png b/src/id/komikplay/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikplay/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikplay/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikplay/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikplay/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikplay/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikplay/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikplay/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikplay/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikplay/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikplay/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikplay/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikplay/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/komikplay/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikplay/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/komikplay/src/KomikPlay.kt b/src/id/komikplay/src/eu/kanade/tachiyomi/extension/id/komikplay/KomikPlay.kt
similarity index 100%
rename from multisrc/overrides/zmanga/komikplay/src/KomikPlay.kt
rename to src/id/komikplay/src/eu/kanade/tachiyomi/extension/id/komikplay/KomikPlay.kt
diff --git a/src/id/komikrealm/build.gradle b/src/id/komikrealm/build.gradle
new file mode 100644
index 000000000..d836ab68c
--- /dev/null
+++ b/src/id/komikrealm/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'KomikRealm'
+ extClass = '.KomikRealm'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://www.komikrealm.my.id'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/komikrealm/res/mipmap-hdpi/ic_launcher.png b/src/id/komikrealm/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/komikrealm/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikrealm/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/komikrealm/res/mipmap-mdpi/ic_launcher.png b/src/id/komikrealm/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/komikrealm/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikrealm/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/komikrealm/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikrealm/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/komikrealm/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikrealm/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/komikrealm/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikrealm/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/komikrealm/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikrealm/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/komikrealm/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikrealm/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/komikrealm/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikrealm/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/komikrealm/src/KomikRealm.kt b/src/id/komikrealm/src/eu/kanade/tachiyomi/extension/id/komikrealm/KomikRealm.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/komikrealm/src/KomikRealm.kt
rename to src/id/komikrealm/src/eu/kanade/tachiyomi/extension/id/komikrealm/KomikRealm.kt
diff --git a/src/id/komiksan/build.gradle b/src/id/komiksan/build.gradle
new file mode 100644
index 000000000..279f6d6a9
--- /dev/null
+++ b/src/id/komiksan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Komiksan'
+ extClass = '.Komiksan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://komiksan.link'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/komiksan/res/mipmap-hdpi/ic_launcher.png b/src/id/komiksan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiksan/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komiksan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiksan/res/mipmap-mdpi/ic_launcher.png b/src/id/komiksan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiksan/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komiksan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiksan/res/mipmap-xhdpi/ic_launcher.png b/src/id/komiksan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiksan/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komiksan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiksan/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komiksan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiksan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komiksan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiksan/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komiksan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiksan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komiksan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiksan/src/Komiksan.kt b/src/id/komiksan/src/eu/kanade/tachiyomi/extension/id/komiksan/Komiksan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiksan/src/Komiksan.kt
rename to src/id/komiksan/src/eu/kanade/tachiyomi/extension/id/komiksan/Komiksan.kt
diff --git a/src/id/komikstation/build.gradle b/src/id/komikstation/build.gradle
new file mode 100644
index 000000000..578f6b147
--- /dev/null
+++ b/src/id/komikstation/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Komik Station'
+ extClass = '.KomikStation'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://komikstation.co'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/komikstation/res/mipmap-hdpi/ic_launcher.png b/src/id/komikstation/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikstation/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikstation/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikstation/res/mipmap-mdpi/ic_launcher.png b/src/id/komikstation/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikstation/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikstation/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikstation/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikstation/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikstation/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikstation/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikstation/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikstation/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikstation/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikstation/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikstation/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikstation/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikstation/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikstation/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikstation/src/KomikStation.kt b/src/id/komikstation/src/eu/kanade/tachiyomi/extension/id/komikstation/KomikStation.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikstation/src/KomikStation.kt
rename to src/id/komikstation/src/eu/kanade/tachiyomi/extension/id/komikstation/KomikStation.kt
diff --git a/src/id/komiktap/build.gradle b/src/id/komiktap/build.gradle
new file mode 100644
index 000000000..fd59f0b47
--- /dev/null
+++ b/src/id/komiktap/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Komiktap'
+ extClass = '.Komiktap'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://komiktap.me'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/komiktap/res/mipmap-hdpi/ic_launcher.png b/src/id/komiktap/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiktap/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komiktap/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiktap/res/mipmap-mdpi/ic_launcher.png b/src/id/komiktap/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiktap/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komiktap/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiktap/res/mipmap-xhdpi/ic_launcher.png b/src/id/komiktap/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiktap/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komiktap/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiktap/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komiktap/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiktap/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komiktap/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiktap/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komiktap/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiktap/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komiktap/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komiktap/src/Komiktap.kt b/src/id/komiktap/src/eu/kanade/tachiyomi/extension/id/komiktap/Komiktap.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/komiktap/src/Komiktap.kt
rename to src/id/komiktap/src/eu/kanade/tachiyomi/extension/id/komiktap/Komiktap.kt
diff --git a/src/id/komikucom/build.gradle b/src/id/komikucom/build.gradle
new file mode 100644
index 000000000..6d92cebda
--- /dev/null
+++ b/src/id/komikucom/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Komiku.com'
+ extClass = '.KomikuCom'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://komiku.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/komikucom/res/mipmap-hdpi/ic_launcher.png b/src/id/komikucom/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikucom/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikucom/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikucom/res/mipmap-mdpi/ic_launcher.png b/src/id/komikucom/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikucom/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikucom/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikucom/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikucom/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikucom/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikucom/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikucom/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikucom/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikucom/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikucom/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikucom/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikucom/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikucom/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikucom/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/komikucom/src/KomikuCom.kt b/src/id/komikucom/src/eu/kanade/tachiyomi/extension/id/komikucom/KomikuCom.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/komikucom/src/KomikuCom.kt
rename to src/id/komikucom/src/eu/kanade/tachiyomi/extension/id/komikucom/KomikuCom.kt
diff --git a/src/id/komikzoid/build.gradle b/src/id/komikzoid/build.gradle
new file mode 100644
index 000000000..1d1b18e8a
--- /dev/null
+++ b/src/id/komikzoid/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Komikzoid'
+ extClass = '.Komikzoid'
+ themePkg = 'colorlibanime'
+ baseUrl = 'https://komikzoid.id'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/colorlibanime/komikzoid/res/mipmap-hdpi/ic_launcher.png b/src/id/komikzoid/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/komikzoid/res/mipmap-hdpi/ic_launcher.png
rename to src/id/komikzoid/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/komikzoid/res/mipmap-mdpi/ic_launcher.png b/src/id/komikzoid/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/komikzoid/res/mipmap-mdpi/ic_launcher.png
rename to src/id/komikzoid/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/komikzoid/res/mipmap-xhdpi/ic_launcher.png b/src/id/komikzoid/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/komikzoid/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/komikzoid/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/komikzoid/res/mipmap-xxhdpi/ic_launcher.png b/src/id/komikzoid/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/komikzoid/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/komikzoid/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/komikzoid/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/komikzoid/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/komikzoid/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/komikzoid/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/id/komikzoid/src/eu/kanade/tachiyomi/extension/id/komikzoid/Komikzoid.kt b/src/id/komikzoid/src/eu/kanade/tachiyomi/extension/id/komikzoid/Komikzoid.kt
new file mode 100644
index 000000000..d9665fef1
--- /dev/null
+++ b/src/id/komikzoid/src/eu/kanade/tachiyomi/extension/id/komikzoid/Komikzoid.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.id.komikzoid
+
+import eu.kanade.tachiyomi.multisrc.colorlibanime.ColorlibAnime
+
+class Komikzoid : ColorlibAnime("Komikzoid", "https://komikzoid.id", "id")
diff --git a/src/id/kumapoi/build.gradle b/src/id/kumapoi/build.gradle
new file mode 100644
index 000000000..70dc03ef1
--- /dev/null
+++ b/src/id/kumapoi/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'KumaPoi'
+ extClass = '.KumaPoi'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://kumapoi.info'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/kumapoi/res/mipmap-hdpi/ic_launcher.png b/src/id/kumapoi/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kumapoi/res/mipmap-hdpi/ic_launcher.png
rename to src/id/kumapoi/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kumapoi/res/mipmap-mdpi/ic_launcher.png b/src/id/kumapoi/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kumapoi/res/mipmap-mdpi/ic_launcher.png
rename to src/id/kumapoi/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kumapoi/res/mipmap-xhdpi/ic_launcher.png b/src/id/kumapoi/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kumapoi/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/kumapoi/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kumapoi/res/mipmap-xxhdpi/ic_launcher.png b/src/id/kumapoi/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kumapoi/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/kumapoi/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kumapoi/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/kumapoi/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/kumapoi/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/kumapoi/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/kumapoi/src/KumaPoi.kt b/src/id/kumapoi/src/eu/kanade/tachiyomi/extension/id/kumapoi/KumaPoi.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/kumapoi/src/KumaPoi.kt
rename to src/id/kumapoi/src/eu/kanade/tachiyomi/extension/id/kumapoi/KumaPoi.kt
diff --git a/src/id/lianscans/build.gradle b/src/id/lianscans/build.gradle
new file mode 100644
index 000000000..e559e2552
--- /dev/null
+++ b/src/id/lianscans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'LianScans'
+ extClass = '.LianScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://www.lianscans.my.id'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/lianscans/res/mipmap-hdpi/ic_launcher.png b/src/id/lianscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lianscans/res/mipmap-hdpi/ic_launcher.png
rename to src/id/lianscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lianscans/res/mipmap-mdpi/ic_launcher.png b/src/id/lianscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lianscans/res/mipmap-mdpi/ic_launcher.png
rename to src/id/lianscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lianscans/res/mipmap-xhdpi/ic_launcher.png b/src/id/lianscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lianscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/lianscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lianscans/res/mipmap-xxhdpi/ic_launcher.png b/src/id/lianscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lianscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/lianscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lianscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/lianscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lianscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/lianscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lianscans/src/LianScans.kt b/src/id/lianscans/src/eu/kanade/tachiyomi/extension/id/lianscans/LianScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/lianscans/src/LianScans.kt
rename to src/id/lianscans/src/eu/kanade/tachiyomi/extension/id/lianscans/LianScans.kt
diff --git a/src/id/maidmanga/build.gradle b/src/id/maidmanga/build.gradle
new file mode 100644
index 000000000..1f94cf077
--- /dev/null
+++ b/src/id/maidmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Maid - Manga'
+ extClass = '.MaidManga'
+ themePkg = 'zmanga'
+ baseUrl = 'https://www.maid.my.id'
+ overrideVersionCode = 10
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zmanga/maidmanga/res/mipmap-hdpi/ic_launcher.png b/src/id/maidmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/maidmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/id/maidmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/maidmanga/res/mipmap-mdpi/ic_launcher.png b/src/id/maidmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/maidmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/id/maidmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/maidmanga/res/mipmap-xhdpi/ic_launcher.png b/src/id/maidmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/maidmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/maidmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/maidmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/id/maidmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/maidmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/maidmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/maidmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/maidmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/maidmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/maidmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/maidmanga/src/MaidManga.kt b/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt
similarity index 100%
rename from multisrc/overrides/zmanga/maidmanga/src/MaidManga.kt
rename to src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt
diff --git a/src/id/mangaid/build.gradle b/src/id/mangaid/build.gradle
new file mode 100644
index 000000000..fe623be23
--- /dev/null
+++ b/src/id/mangaid/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaID'
+ extClass = '.MangaID'
+ themePkg = 'mmrcms'
+ baseUrl = 'https://mangaid.click'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mmrcms/mangaid/res/mipmap-hdpi/ic_launcher.png b/src/id/mangaid/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangaid/res/mipmap-hdpi/ic_launcher.png
rename to src/id/mangaid/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangaid/res/mipmap-mdpi/ic_launcher.png b/src/id/mangaid/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangaid/res/mipmap-mdpi/ic_launcher.png
rename to src/id/mangaid/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangaid/res/mipmap-xhdpi/ic_launcher.png b/src/id/mangaid/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangaid/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/mangaid/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangaid/res/mipmap-xxhdpi/ic_launcher.png b/src/id/mangaid/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangaid/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/mangaid/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mmrcms/mangaid/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/mangaid/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mmrcms/mangaid/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/mangaid/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/id/mangaid/src/eu/kanade/tachiyomi/extension/id/mangaid/MangaID.kt b/src/id/mangaid/src/eu/kanade/tachiyomi/extension/id/mangaid/MangaID.kt
new file mode 100644
index 000000000..982481338
--- /dev/null
+++ b/src/id/mangaid/src/eu/kanade/tachiyomi/extension/id/mangaid/MangaID.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.id.mangaid
+
+import eu.kanade.tachiyomi.multisrc.mmrcms.MMRCMS
+
+class MangaID : MMRCMS("MangaID", "https://mangaid.click", "id")
diff --git a/src/id/mangakita/build.gradle b/src/id/mangakita/build.gradle
new file mode 100644
index 000000000..64521bfcd
--- /dev/null
+++ b/src/id/mangakita/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaKita'
+ extClass = '.MangaKita'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangakita.id'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangakita/res/mipmap-hdpi/ic_launcher.png b/src/id/mangakita/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakita/res/mipmap-hdpi/ic_launcher.png
rename to src/id/mangakita/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakita/res/mipmap-mdpi/ic_launcher.png b/src/id/mangakita/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakita/res/mipmap-mdpi/ic_launcher.png
rename to src/id/mangakita/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakita/res/mipmap-xhdpi/ic_launcher.png b/src/id/mangakita/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakita/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/mangakita/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakita/res/mipmap-xxhdpi/ic_launcher.png b/src/id/mangakita/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakita/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/mangakita/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakita/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/mangakita/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakita/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/mangakita/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakita/src/MangaKita.kt b/src/id/mangakita/src/eu/kanade/tachiyomi/extension/id/mangakita/MangaKita.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakita/src/MangaKita.kt
rename to src/id/mangakita/src/eu/kanade/tachiyomi/extension/id/mangakita/MangaKita.kt
diff --git a/src/id/mangakyo/build.gradle b/src/id/mangakyo/build.gradle
new file mode 100644
index 000000000..be69380d0
--- /dev/null
+++ b/src/id/mangakyo/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangakyo'
+ extClass = '.Mangakyo'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangakyo.vip'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangakyo/res/mipmap-hdpi/ic_launcher.png b/src/id/mangakyo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakyo/res/mipmap-hdpi/ic_launcher.png
rename to src/id/mangakyo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakyo/res/mipmap-mdpi/ic_launcher.png b/src/id/mangakyo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakyo/res/mipmap-mdpi/ic_launcher.png
rename to src/id/mangakyo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakyo/res/mipmap-xhdpi/ic_launcher.png b/src/id/mangakyo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakyo/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/mangakyo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakyo/res/mipmap-xxhdpi/ic_launcher.png b/src/id/mangakyo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakyo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/mangakyo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakyo/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/mangakyo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakyo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/mangakyo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakyo/src/Mangakyo.kt b/src/id/mangakyo/src/eu/kanade/tachiyomi/extension/id/mangakyo/Mangakyo.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakyo/src/Mangakyo.kt
rename to src/id/mangakyo/src/eu/kanade/tachiyomi/extension/id/mangakyo/Mangakyo.kt
diff --git a/src/id/mangashiro/build.gradle b/src/id/mangashiro/build.gradle
new file mode 100644
index 000000000..7921069e9
--- /dev/null
+++ b/src/id/mangashiro/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaShiro'
+ extClass = '.MangaShiro'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangashiro.me'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangashiro/res/mipmap-hdpi/ic_launcher.png b/src/id/mangashiro/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangashiro/res/mipmap-hdpi/ic_launcher.png
rename to src/id/mangashiro/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangashiro/res/mipmap-mdpi/ic_launcher.png b/src/id/mangashiro/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangashiro/res/mipmap-mdpi/ic_launcher.png
rename to src/id/mangashiro/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangashiro/res/mipmap-xhdpi/ic_launcher.png b/src/id/mangashiro/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangashiro/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/mangashiro/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangashiro/res/mipmap-xxhdpi/ic_launcher.png b/src/id/mangashiro/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangashiro/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/mangashiro/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangashiro/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/mangashiro/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangashiro/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/mangashiro/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangashiro/src/MangaShiro.kt b/src/id/mangashiro/src/eu/kanade/tachiyomi/extension/id/mangashiro/MangaShiro.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangashiro/src/MangaShiro.kt
rename to src/id/mangashiro/src/eu/kanade/tachiyomi/extension/id/mangashiro/MangaShiro.kt
diff --git a/src/id/mangasusu/build.gradle b/src/id/mangasusu/build.gradle
new file mode 100644
index 000000000..b666dfd46
--- /dev/null
+++ b/src/id/mangasusu/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Mangasusu'
+ extClass = '.Mangasusu'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangasusuku.xyz'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangasusu/res/mipmap-hdpi/ic_launcher.png b/src/id/mangasusu/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangasusu/res/mipmap-hdpi/ic_launcher.png
rename to src/id/mangasusu/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangasusu/res/mipmap-mdpi/ic_launcher.png b/src/id/mangasusu/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangasusu/res/mipmap-mdpi/ic_launcher.png
rename to src/id/mangasusu/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangasusu/res/mipmap-xhdpi/ic_launcher.png b/src/id/mangasusu/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangasusu/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/mangasusu/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangasusu/res/mipmap-xxhdpi/ic_launcher.png b/src/id/mangasusu/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangasusu/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/mangasusu/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangasusu/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/mangasusu/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangasusu/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/mangasusu/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangasusu/src/Mangasusu.kt b/src/id/mangasusu/src/eu/kanade/tachiyomi/extension/id/mangasusu/Mangasusu.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangasusu/src/Mangasusu.kt
rename to src/id/mangasusu/src/eu/kanade/tachiyomi/extension/id/mangasusu/Mangasusu.kt
diff --git a/src/id/mangatale/build.gradle b/src/id/mangatale/build.gradle
new file mode 100644
index 000000000..e8db20776
--- /dev/null
+++ b/src/id/mangatale/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaTale'
+ extClass = '.MangaTale'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangatale.co'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangatale/res/mipmap-hdpi/ic_launcher.png b/src/id/mangatale/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangatale/res/mipmap-hdpi/ic_launcher.png
rename to src/id/mangatale/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangatale/res/mipmap-mdpi/ic_launcher.png b/src/id/mangatale/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangatale/res/mipmap-mdpi/ic_launcher.png
rename to src/id/mangatale/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangatale/res/mipmap-xhdpi/ic_launcher.png b/src/id/mangatale/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangatale/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/mangatale/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangatale/res/mipmap-xxhdpi/ic_launcher.png b/src/id/mangatale/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangatale/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/mangatale/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangatale/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/mangatale/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangatale/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/mangatale/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangatale/src/MangaTale.kt b/src/id/mangatale/src/eu/kanade/tachiyomi/extension/id/mangatale/MangaTale.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangatale/src/MangaTale.kt
rename to src/id/mangatale/src/eu/kanade/tachiyomi/extension/id/mangatale/MangaTale.kt
diff --git a/src/id/mangayaro/build.gradle b/src/id/mangayaro/build.gradle
new file mode 100644
index 000000000..3add99ebd
--- /dev/null
+++ b/src/id/mangayaro/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangayaro'
+ extClass = '.Mangayaro'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://www.mangayaro.id'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangayaro/res/mipmap-hdpi/ic_launcher.png b/src/id/mangayaro/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangayaro/res/mipmap-hdpi/ic_launcher.png
rename to src/id/mangayaro/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangayaro/res/mipmap-mdpi/ic_launcher.png b/src/id/mangayaro/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangayaro/res/mipmap-mdpi/ic_launcher.png
rename to src/id/mangayaro/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangayaro/res/mipmap-xhdpi/ic_launcher.png b/src/id/mangayaro/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangayaro/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/mangayaro/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangayaro/res/mipmap-xxhdpi/ic_launcher.png b/src/id/mangayaro/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangayaro/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/mangayaro/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangayaro/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/mangayaro/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangayaro/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/mangayaro/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangayaro/src/Mangayaro.kt b/src/id/mangayaro/src/eu/kanade/tachiyomi/extension/id/mangayaro/Mangayaro.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangayaro/src/Mangayaro.kt
rename to src/id/mangayaro/src/eu/kanade/tachiyomi/extension/id/mangayaro/Mangayaro.kt
diff --git a/src/id/mangayu/build.gradle b/src/id/mangayu/build.gradle
new file mode 100644
index 000000000..aa22d8c49
--- /dev/null
+++ b/src/id/mangayu/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaYu'
+ extClass = '.MangaYu'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangayu.id'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangayu/res/mipmap-hdpi/ic_launcher.png b/src/id/mangayu/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangayu/res/mipmap-hdpi/ic_launcher.png
rename to src/id/mangayu/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangayu/res/mipmap-mdpi/ic_launcher.png b/src/id/mangayu/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangayu/res/mipmap-mdpi/ic_launcher.png
rename to src/id/mangayu/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangayu/res/mipmap-xhdpi/ic_launcher.png b/src/id/mangayu/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangayu/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/mangayu/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangayu/res/mipmap-xxhdpi/ic_launcher.png b/src/id/mangayu/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangayu/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/mangayu/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangayu/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/mangayu/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangayu/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/mangayu/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangayu/src/MangaYu.kt b/src/id/mangayu/src/eu/kanade/tachiyomi/extension/id/mangayu/MangaYu.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangayu/src/MangaYu.kt
rename to src/id/mangayu/src/eu/kanade/tachiyomi/extension/id/mangayu/MangaYu.kt
diff --git a/src/id/mangkomik/build.gradle b/src/id/mangkomik/build.gradle
new file mode 100644
index 000000000..e11eb88f2
--- /dev/null
+++ b/src/id/mangkomik/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Siren Komik'
+ extClass = '.MangKomik'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://sirenkomik.my.id'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangkomik/res/mipmap-hdpi/ic_launcher.png b/src/id/mangkomik/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangkomik/res/mipmap-hdpi/ic_launcher.png
rename to src/id/mangkomik/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangkomik/res/mipmap-mdpi/ic_launcher.png b/src/id/mangkomik/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangkomik/res/mipmap-mdpi/ic_launcher.png
rename to src/id/mangkomik/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangkomik/res/mipmap-xhdpi/ic_launcher.png b/src/id/mangkomik/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangkomik/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/mangkomik/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangkomik/res/mipmap-xxhdpi/ic_launcher.png b/src/id/mangkomik/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangkomik/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/mangkomik/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangkomik/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/mangkomik/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangkomik/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/mangkomik/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangkomik/src/MangKomik.kt b/src/id/mangkomik/src/eu/kanade/tachiyomi/extension/id/mangkomik/MangKomik.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangkomik/src/MangKomik.kt
rename to src/id/mangkomik/src/eu/kanade/tachiyomi/extension/id/mangkomik/MangKomik.kt
diff --git a/src/id/manhwadesu/build.gradle b/src/id/manhwadesu/build.gradle
new file mode 100644
index 000000000..40b767aac
--- /dev/null
+++ b/src/id/manhwadesu/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManhwaDesu'
+ extClass = '.ManhwaDesu'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://manhwadesu.one'
+ overrideVersionCode = 4
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/manhwadesu/res/mipmap-hdpi/ic_launcher.png b/src/id/manhwadesu/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwadesu/res/mipmap-hdpi/ic_launcher.png
rename to src/id/manhwadesu/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwadesu/res/mipmap-mdpi/ic_launcher.png b/src/id/manhwadesu/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwadesu/res/mipmap-mdpi/ic_launcher.png
rename to src/id/manhwadesu/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwadesu/res/mipmap-xhdpi/ic_launcher.png b/src/id/manhwadesu/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwadesu/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/manhwadesu/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwadesu/res/mipmap-xxhdpi/ic_launcher.png b/src/id/manhwadesu/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwadesu/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/manhwadesu/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwadesu/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/manhwadesu/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwadesu/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/manhwadesu/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwadesu/src/ManhwaDesu.kt b/src/id/manhwadesu/src/eu/kanade/tachiyomi/extension/id/manhwadesu/ManhwaDesu.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwadesu/src/ManhwaDesu.kt
rename to src/id/manhwadesu/src/eu/kanade/tachiyomi/extension/id/manhwadesu/ManhwaDesu.kt
diff --git a/multisrc/overrides/mangathemesia/manhwaindo/CHANGELOG.md b/src/id/manhwaindo/CHANGELOG.md
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwaindo/CHANGELOG.md
rename to src/id/manhwaindo/CHANGELOG.md
diff --git a/src/id/manhwaindo/build.gradle b/src/id/manhwaindo/build.gradle
new file mode 100644
index 000000000..be0b105fe
--- /dev/null
+++ b/src/id/manhwaindo/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManhwaIndo'
+ extClass = '.ManhwaIndo'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://manhwaindo.id'
+ overrideVersionCode = 4
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/manhwaindo/res/mipmap-hdpi/ic_launcher.png b/src/id/manhwaindo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwaindo/res/mipmap-hdpi/ic_launcher.png
rename to src/id/manhwaindo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwaindo/res/mipmap-mdpi/ic_launcher.png b/src/id/manhwaindo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwaindo/res/mipmap-mdpi/ic_launcher.png
rename to src/id/manhwaindo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwaindo/res/mipmap-xhdpi/ic_launcher.png b/src/id/manhwaindo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwaindo/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/manhwaindo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwaindo/res/mipmap-xxhdpi/ic_launcher.png b/src/id/manhwaindo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwaindo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/manhwaindo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwaindo/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/manhwaindo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwaindo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/manhwaindo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwaindo/src/ManhwaIndo.kt b/src/id/manhwaindo/src/eu/kanade/tachiyomi/extension/id/manhwaindo/ManhwaIndo.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwaindo/src/ManhwaIndo.kt
rename to src/id/manhwaindo/src/eu/kanade/tachiyomi/extension/id/manhwaindo/ManhwaIndo.kt
diff --git a/src/id/manhwalandmom/build.gradle b/src/id/manhwalandmom/build.gradle
new file mode 100644
index 000000000..cea56b60b
--- /dev/null
+++ b/src/id/manhwalandmom/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManhwaLand.mom'
+ extClass = '.ManhwaLandMom'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://manhwaland.lat'
+ overrideVersionCode = 5
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/manhwalandmom/res/mipmap-hdpi/ic_launcher.png b/src/id/manhwalandmom/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalandmom/res/mipmap-hdpi/ic_launcher.png
rename to src/id/manhwalandmom/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalandmom/res/mipmap-mdpi/ic_launcher.png b/src/id/manhwalandmom/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalandmom/res/mipmap-mdpi/ic_launcher.png
rename to src/id/manhwalandmom/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalandmom/res/mipmap-xhdpi/ic_launcher.png b/src/id/manhwalandmom/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalandmom/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/manhwalandmom/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalandmom/res/mipmap-xxhdpi/ic_launcher.png b/src/id/manhwalandmom/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalandmom/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/manhwalandmom/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalandmom/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/manhwalandmom/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalandmom/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/manhwalandmom/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalandmom/src/ManhwaLandMom.kt b/src/id/manhwalandmom/src/eu/kanade/tachiyomi/extension/id/manhwalandmom/ManhwaLandMom.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalandmom/src/ManhwaLandMom.kt
rename to src/id/manhwalandmom/src/eu/kanade/tachiyomi/extension/id/manhwalandmom/ManhwaLandMom.kt
diff --git a/src/id/manhwalist/build.gradle b/src/id/manhwalist/build.gradle
new file mode 100644
index 000000000..6272660ed
--- /dev/null
+++ b/src/id/manhwalist/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManhwaList'
+ extClass = '.ManhwaList'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://manhwalist.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/manhwalist/res/mipmap-hdpi/ic_launcher.png b/src/id/manhwalist/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalist/res/mipmap-hdpi/ic_launcher.png
rename to src/id/manhwalist/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalist/res/mipmap-mdpi/ic_launcher.png b/src/id/manhwalist/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalist/res/mipmap-mdpi/ic_launcher.png
rename to src/id/manhwalist/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalist/res/mipmap-xhdpi/ic_launcher.png b/src/id/manhwalist/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalist/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/manhwalist/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalist/res/mipmap-xxhdpi/ic_launcher.png b/src/id/manhwalist/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalist/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/manhwalist/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalist/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/manhwalist/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalist/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/manhwalist/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/manhwalist/src/ManhwaList.kt b/src/id/manhwalist/src/eu/kanade/tachiyomi/extension/id/manhwalist/ManhwaList.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/manhwalist/src/ManhwaList.kt
rename to src/id/manhwalist/src/eu/kanade/tachiyomi/extension/id/manhwalist/ManhwaList.kt
diff --git a/src/id/masterkomik/build.gradle b/src/id/masterkomik/build.gradle
new file mode 100644
index 000000000..7670e2aeb
--- /dev/null
+++ b/src/id/masterkomik/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Tenshi.id'
+ extClass = '.TenshiId'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://tenshi.id'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/masterkomik/res/mipmap-hdpi/ic_launcher.png b/src/id/masterkomik/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/masterkomik/res/mipmap-hdpi/ic_launcher.png
rename to src/id/masterkomik/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/masterkomik/res/mipmap-mdpi/ic_launcher.png b/src/id/masterkomik/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/masterkomik/res/mipmap-mdpi/ic_launcher.png
rename to src/id/masterkomik/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/masterkomik/res/mipmap-xhdpi/ic_launcher.png b/src/id/masterkomik/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/masterkomik/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/masterkomik/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/masterkomik/res/mipmap-xxhdpi/ic_launcher.png b/src/id/masterkomik/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/masterkomik/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/masterkomik/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/masterkomik/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/masterkomik/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/masterkomik/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/masterkomik/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/masterkomik/src/TenshiId.kt b/src/id/masterkomik/src/eu/kanade/tachiyomi/extension/id/masterkomik/TenshiId.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/masterkomik/src/TenshiId.kt
rename to src/id/masterkomik/src/eu/kanade/tachiyomi/extension/id/masterkomik/TenshiId.kt
diff --git a/src/id/melokomik/build.gradle b/src/id/melokomik/build.gradle
new file mode 100644
index 000000000..ff65ec3be
--- /dev/null
+++ b/src/id/melokomik/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MELOKOMIK'
+ extClass = '.MELOKOMIK'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://melokomik.xyz'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/melokomik/res/mipmap-hdpi/ic_launcher.png b/src/id/melokomik/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/melokomik/res/mipmap-hdpi/ic_launcher.png
rename to src/id/melokomik/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/melokomik/res/mipmap-mdpi/ic_launcher.png b/src/id/melokomik/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/melokomik/res/mipmap-mdpi/ic_launcher.png
rename to src/id/melokomik/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/melokomik/res/mipmap-xhdpi/ic_launcher.png b/src/id/melokomik/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/melokomik/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/melokomik/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/melokomik/res/mipmap-xxhdpi/ic_launcher.png b/src/id/melokomik/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/melokomik/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/melokomik/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/melokomik/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/melokomik/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/melokomik/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/melokomik/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/melokomik/src/MELOKOMIK.kt b/src/id/melokomik/src/eu/kanade/tachiyomi/extension/id/melokomik/MELOKOMIK.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/melokomik/src/MELOKOMIK.kt
rename to src/id/melokomik/src/eu/kanade/tachiyomi/extension/id/melokomik/MELOKOMIK.kt
diff --git a/src/id/mgkomik/build.gradle b/src/id/mgkomik/build.gradle
new file mode 100644
index 000000000..cb577f704
--- /dev/null
+++ b/src/id/mgkomik/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MG Komik'
+ extClass = '.MGKomik'
+ themePkg = 'madara'
+ baseUrl = 'https://mgkomik.id'
+ overrideVersionCode = 12
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mgkomik/res/mipmap-hdpi/ic_launcher.png b/src/id/mgkomik/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mgkomik/res/mipmap-hdpi/ic_launcher.png
rename to src/id/mgkomik/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mgkomik/res/mipmap-mdpi/ic_launcher.png b/src/id/mgkomik/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mgkomik/res/mipmap-mdpi/ic_launcher.png
rename to src/id/mgkomik/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mgkomik/res/mipmap-xhdpi/ic_launcher.png b/src/id/mgkomik/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mgkomik/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/mgkomik/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mgkomik/res/mipmap-xxhdpi/ic_launcher.png b/src/id/mgkomik/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mgkomik/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/mgkomik/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mgkomik/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/mgkomik/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mgkomik/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/mgkomik/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mgkomik/src/MGKomik.kt b/src/id/mgkomik/src/eu/kanade/tachiyomi/extension/id/mgkomik/MGKomik.kt
similarity index 100%
rename from multisrc/overrides/madara/mgkomik/src/MGKomik.kt
rename to src/id/mgkomik/src/eu/kanade/tachiyomi/extension/id/mgkomik/MGKomik.kt
diff --git a/src/id/mikoroku/build.gradle b/src/id/mikoroku/build.gradle
new file mode 100644
index 000000000..d643f1d49
--- /dev/null
+++ b/src/id/mikoroku/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MikoRoku'
+ extClass = '.MikoRoku'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://www.mikoroku.web.id'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/mikoroku/res/mipmap-hdpi/ic_launcher.png b/src/id/mikoroku/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mikoroku/res/mipmap-hdpi/ic_launcher.png
rename to src/id/mikoroku/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mikoroku/res/mipmap-mdpi/ic_launcher.png b/src/id/mikoroku/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mikoroku/res/mipmap-mdpi/ic_launcher.png
rename to src/id/mikoroku/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mikoroku/res/mipmap-xhdpi/ic_launcher.png b/src/id/mikoroku/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mikoroku/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/mikoroku/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mikoroku/res/mipmap-xxhdpi/ic_launcher.png b/src/id/mikoroku/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mikoroku/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/mikoroku/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mikoroku/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/mikoroku/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mikoroku/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/mikoroku/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mikoroku/src/MikoRoku.kt b/src/id/mikoroku/src/eu/kanade/tachiyomi/extension/id/mikoroku/MikoRoku.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/mikoroku/src/MikoRoku.kt
rename to src/id/mikoroku/src/eu/kanade/tachiyomi/extension/id/mikoroku/MikoRoku.kt
diff --git a/src/id/miraiscans/build.gradle b/src/id/miraiscans/build.gradle
new file mode 100644
index 000000000..af7cdc0fc
--- /dev/null
+++ b/src/id/miraiscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mirai Scans'
+ extClass = '.MiraiScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://miraiscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/miraiscans/res/mipmap-hdpi/ic_launcher.png b/src/id/miraiscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/miraiscans/res/mipmap-hdpi/ic_launcher.png
rename to src/id/miraiscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/miraiscans/res/mipmap-mdpi/ic_launcher.png b/src/id/miraiscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/miraiscans/res/mipmap-mdpi/ic_launcher.png
rename to src/id/miraiscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/miraiscans/res/mipmap-xhdpi/ic_launcher.png b/src/id/miraiscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/miraiscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/miraiscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/miraiscans/res/mipmap-xxhdpi/ic_launcher.png b/src/id/miraiscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/miraiscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/miraiscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/miraiscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/miraiscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/miraiscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/miraiscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/miraiscans/src/MiraiScans.kt b/src/id/miraiscans/src/eu/kanade/tachiyomi/extension/id/miraiscans/MiraiScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/miraiscans/src/MiraiScans.kt
rename to src/id/miraiscans/src/eu/kanade/tachiyomi/extension/id/miraiscans/MiraiScans.kt
diff --git a/src/id/mirrordesu/build.gradle b/src/id/mirrordesu/build.gradle
new file mode 100644
index 000000000..8e4ddddcf
--- /dev/null
+++ b/src/id/mirrordesu/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MirrorDesu'
+ extClass = '.MirrorDesu'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mirrordesu.me'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mirrordesu/res/mipmap-hdpi/ic_launcher.png b/src/id/mirrordesu/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mirrordesu/res/mipmap-hdpi/ic_launcher.png
rename to src/id/mirrordesu/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mirrordesu/res/mipmap-mdpi/ic_launcher.png b/src/id/mirrordesu/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mirrordesu/res/mipmap-mdpi/ic_launcher.png
rename to src/id/mirrordesu/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mirrordesu/res/mipmap-xhdpi/ic_launcher.png b/src/id/mirrordesu/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mirrordesu/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/mirrordesu/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mirrordesu/res/mipmap-xxhdpi/ic_launcher.png b/src/id/mirrordesu/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mirrordesu/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/mirrordesu/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mirrordesu/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/mirrordesu/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mirrordesu/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/mirrordesu/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mirrordesu/src/MirrorDesu.kt b/src/id/mirrordesu/src/eu/kanade/tachiyomi/extension/id/mirrordesu/MirrorDesu.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mirrordesu/src/MirrorDesu.kt
rename to src/id/mirrordesu/src/eu/kanade/tachiyomi/extension/id/mirrordesu/MirrorDesu.kt
diff --git a/src/id/natsu/build.gradle b/src/id/natsu/build.gradle
new file mode 100644
index 000000000..f8c546b42
--- /dev/null
+++ b/src/id/natsu/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Natsu'
+ extClass = '.Natsu'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://natsu.id'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/natsu/res/mipmap-hdpi/ic_launcher.png b/src/id/natsu/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/natsu/res/mipmap-hdpi/ic_launcher.png
rename to src/id/natsu/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/natsu/res/mipmap-mdpi/ic_launcher.png b/src/id/natsu/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/natsu/res/mipmap-mdpi/ic_launcher.png
rename to src/id/natsu/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/natsu/res/mipmap-xhdpi/ic_launcher.png b/src/id/natsu/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/natsu/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/natsu/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/natsu/res/mipmap-xxhdpi/ic_launcher.png b/src/id/natsu/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/natsu/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/natsu/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/natsu/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/natsu/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/natsu/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/natsu/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/natsu/src/Natsu.kt b/src/id/natsu/src/eu/kanade/tachiyomi/extension/id/natsu/Natsu.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/natsu/src/Natsu.kt
rename to src/id/natsu/src/eu/kanade/tachiyomi/extension/id/natsu/Natsu.kt
diff --git a/src/id/nekomik/build.gradle b/src/id/nekomik/build.gradle
new file mode 100644
index 000000000..0cc4ad5e8
--- /dev/null
+++ b/src/id/nekomik/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Nekomik'
+ extClass = '.Nekomik'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://nekomik.me'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/nekomik/res/mipmap-hdpi/ic_launcher.png b/src/id/nekomik/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nekomik/res/mipmap-hdpi/ic_launcher.png
rename to src/id/nekomik/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nekomik/res/mipmap-mdpi/ic_launcher.png b/src/id/nekomik/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nekomik/res/mipmap-mdpi/ic_launcher.png
rename to src/id/nekomik/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nekomik/res/mipmap-xhdpi/ic_launcher.png b/src/id/nekomik/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nekomik/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/nekomik/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nekomik/res/mipmap-xxhdpi/ic_launcher.png b/src/id/nekomik/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nekomik/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/nekomik/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nekomik/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/nekomik/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nekomik/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/nekomik/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nekomik/src/Nekomik.kt b/src/id/nekomik/src/eu/kanade/tachiyomi/extension/id/nekomik/Nekomik.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/nekomik/src/Nekomik.kt
rename to src/id/nekomik/src/eu/kanade/tachiyomi/extension/id/nekomik/Nekomik.kt
diff --git a/src/id/neumanga/build.gradle b/src/id/neumanga/build.gradle
new file mode 100644
index 000000000..4c64d581e
--- /dev/null
+++ b/src/id/neumanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Neumanga'
+ extClass = '.Neumanga'
+ themePkg = 'colorlibanime'
+ baseUrl = 'https://neumanga.xyz'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/colorlibanime/neumanga/res/mipmap-hdpi/ic_launcher.png b/src/id/neumanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/neumanga/res/mipmap-hdpi/ic_launcher.png
rename to src/id/neumanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/neumanga/res/mipmap-mdpi/ic_launcher.png b/src/id/neumanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/neumanga/res/mipmap-mdpi/ic_launcher.png
rename to src/id/neumanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/neumanga/res/mipmap-xhdpi/ic_launcher.png b/src/id/neumanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/neumanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/neumanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/neumanga/res/mipmap-xxhdpi/ic_launcher.png b/src/id/neumanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/neumanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/neumanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/neumanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/neumanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/neumanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/neumanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/neumanga/src/Neumanga.kt b/src/id/neumanga/src/eu/kanade/tachiyomi/extension/id/neumanga/Neumanga.kt
similarity index 100%
rename from multisrc/overrides/colorlibanime/neumanga/src/Neumanga.kt
rename to src/id/neumanga/src/eu/kanade/tachiyomi/extension/id/neumanga/Neumanga.kt
diff --git a/src/id/ngomik/build.gradle b/src/id/ngomik/build.gradle
new file mode 100644
index 000000000..05c17090f
--- /dev/null
+++ b/src/id/ngomik/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Ngomik'
+ extClass = '.Ngomik'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://ngomik.net'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/ngomik/res/mipmap-hdpi/ic_launcher.png b/src/id/ngomik/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ngomik/res/mipmap-hdpi/ic_launcher.png
rename to src/id/ngomik/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ngomik/res/mipmap-mdpi/ic_launcher.png b/src/id/ngomik/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ngomik/res/mipmap-mdpi/ic_launcher.png
rename to src/id/ngomik/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ngomik/res/mipmap-xhdpi/ic_launcher.png b/src/id/ngomik/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ngomik/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/ngomik/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ngomik/res/mipmap-xxhdpi/ic_launcher.png b/src/id/ngomik/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ngomik/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/ngomik/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ngomik/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/ngomik/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/ngomik/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/ngomik/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/ngomik/src/Ngomik.kt b/src/id/ngomik/src/eu/kanade/tachiyomi/extension/id/ngomik/Ngomik.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/ngomik/src/Ngomik.kt
rename to src/id/ngomik/src/eu/kanade/tachiyomi/extension/id/ngomik/Ngomik.kt
diff --git a/src/id/noromax/build.gradle b/src/id/noromax/build.gradle
new file mode 100644
index 000000000..5cc911b9d
--- /dev/null
+++ b/src/id/noromax/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Noromax'
+ extClass = '.Noromax'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://noromax.my.id'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/noromax/res/mipmap-hdpi/ic_launcher.png b/src/id/noromax/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/noromax/res/mipmap-hdpi/ic_launcher.png
rename to src/id/noromax/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/noromax/res/mipmap-mdpi/ic_launcher.png b/src/id/noromax/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/noromax/res/mipmap-mdpi/ic_launcher.png
rename to src/id/noromax/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/noromax/res/mipmap-xhdpi/ic_launcher.png b/src/id/noromax/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/noromax/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/noromax/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/noromax/res/mipmap-xxhdpi/ic_launcher.png b/src/id/noromax/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/noromax/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/noromax/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/noromax/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/noromax/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/noromax/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/noromax/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/noromax/src/Noromax.kt b/src/id/noromax/src/eu/kanade/tachiyomi/extension/id/noromax/Noromax.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/noromax/src/Noromax.kt
rename to src/id/noromax/src/eu/kanade/tachiyomi/extension/id/noromax/Noromax.kt
diff --git a/src/id/otsugami/build.gradle b/src/id/otsugami/build.gradle
new file mode 100644
index 000000000..3e73c3b87
--- /dev/null
+++ b/src/id/otsugami/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Otsugami'
+ extClass = '.Otsugami'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://otsugami.id'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/otsugami/res/mipmap-hdpi/ic_launcher.png b/src/id/otsugami/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/otsugami/res/mipmap-hdpi/ic_launcher.png
rename to src/id/otsugami/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/otsugami/res/mipmap-mdpi/ic_launcher.png b/src/id/otsugami/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/otsugami/res/mipmap-mdpi/ic_launcher.png
rename to src/id/otsugami/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/otsugami/res/mipmap-xhdpi/ic_launcher.png b/src/id/otsugami/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/otsugami/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/otsugami/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/otsugami/res/mipmap-xxhdpi/ic_launcher.png b/src/id/otsugami/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/otsugami/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/otsugami/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/otsugami/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/otsugami/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/otsugami/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/otsugami/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/otsugami/src/Otsugami.kt b/src/id/otsugami/src/eu/kanade/tachiyomi/extension/id/otsugami/Otsugami.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/otsugami/src/Otsugami.kt
rename to src/id/otsugami/src/eu/kanade/tachiyomi/extension/id/otsugami/Otsugami.kt
diff --git a/src/id/pojokmanga/build.gradle b/src/id/pojokmanga/build.gradle
new file mode 100644
index 000000000..08793d0a5
--- /dev/null
+++ b/src/id/pojokmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Pojok Manga'
+ extClass = '.PojokManga'
+ themePkg = 'madara'
+ baseUrl = 'https://pojokmanga.net'
+ overrideVersionCode = 5
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/pojokmanga/res/mipmap-hdpi/ic_launcher.png b/src/id/pojokmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pojokmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/id/pojokmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pojokmanga/res/mipmap-mdpi/ic_launcher.png b/src/id/pojokmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pojokmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/id/pojokmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pojokmanga/res/mipmap-xhdpi/ic_launcher.png b/src/id/pojokmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pojokmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/pojokmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pojokmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/id/pojokmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pojokmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/pojokmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pojokmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/pojokmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pojokmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/pojokmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pojokmanga/src/PojokManga.kt b/src/id/pojokmanga/src/eu/kanade/tachiyomi/extension/id/pojokmanga/PojokManga.kt
similarity index 100%
rename from multisrc/overrides/madara/pojokmanga/src/PojokManga.kt
rename to src/id/pojokmanga/src/eu/kanade/tachiyomi/extension/id/pojokmanga/PojokManga.kt
diff --git a/src/id/pornhwa18/build.gradle b/src/id/pornhwa18/build.gradle
new file mode 100644
index 000000000..2197703cd
--- /dev/null
+++ b/src/id/pornhwa18/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Pornhwa18'
+ extClass = '.Pornhwa18'
+ themePkg = 'madara'
+ baseUrl = 'https://pornhwa18.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/pornhwa18/res/mipmap-hdpi/ic_launcher.png b/src/id/pornhwa18/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pornhwa18/res/mipmap-hdpi/ic_launcher.png
rename to src/id/pornhwa18/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pornhwa18/res/mipmap-mdpi/ic_launcher.png b/src/id/pornhwa18/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pornhwa18/res/mipmap-mdpi/ic_launcher.png
rename to src/id/pornhwa18/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pornhwa18/res/mipmap-xhdpi/ic_launcher.png b/src/id/pornhwa18/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pornhwa18/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/pornhwa18/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pornhwa18/res/mipmap-xxhdpi/ic_launcher.png b/src/id/pornhwa18/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pornhwa18/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/pornhwa18/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pornhwa18/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/pornhwa18/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pornhwa18/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/pornhwa18/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pornhwa18/src/Pornhwa18.kt b/src/id/pornhwa18/src/eu/kanade/tachiyomi/extension/id/pornhwa18/Pornhwa18.kt
similarity index 100%
rename from multisrc/overrides/madara/pornhwa18/src/Pornhwa18.kt
rename to src/id/pornhwa18/src/eu/kanade/tachiyomi/extension/id/pornhwa18/Pornhwa18.kt
diff --git a/src/id/sekaikomik/build.gradle b/src/id/sekaikomik/build.gradle
new file mode 100644
index 000000000..efef54f99
--- /dev/null
+++ b/src/id/sekaikomik/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Sekaikomik'
+ extClass = '.Sekaikomik'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://sekaikomik.bio'
+ overrideVersionCode = 11
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/sekaikomik/res/mipmap-hdpi/ic_launcher.png b/src/id/sekaikomik/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sekaikomik/res/mipmap-hdpi/ic_launcher.png
rename to src/id/sekaikomik/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sekaikomik/res/mipmap-mdpi/ic_launcher.png b/src/id/sekaikomik/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sekaikomik/res/mipmap-mdpi/ic_launcher.png
rename to src/id/sekaikomik/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sekaikomik/res/mipmap-xhdpi/ic_launcher.png b/src/id/sekaikomik/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sekaikomik/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/sekaikomik/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sekaikomik/res/mipmap-xxhdpi/ic_launcher.png b/src/id/sekaikomik/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sekaikomik/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/sekaikomik/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sekaikomik/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/sekaikomik/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sekaikomik/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/sekaikomik/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sekaikomik/src/Sekaikomik.kt b/src/id/sekaikomik/src/eu/kanade/tachiyomi/extension/id/sekaikomik/Sekaikomik.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/sekaikomik/src/Sekaikomik.kt
rename to src/id/sekaikomik/src/eu/kanade/tachiyomi/extension/id/sekaikomik/Sekaikomik.kt
diff --git a/src/id/sektedoujin/build.gradle b/src/id/sektedoujin/build.gradle
new file mode 100644
index 000000000..746bdfdd5
--- /dev/null
+++ b/src/id/sektedoujin/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Sekte Doujin'
+ extClass = '.SekteDoujin'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://sektedoujin.cc'
+ overrideVersionCode = 5
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/sektedoujin/res/mipmap-hdpi/ic_launcher.png b/src/id/sektedoujin/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sektedoujin/res/mipmap-hdpi/ic_launcher.png
rename to src/id/sektedoujin/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sektedoujin/res/mipmap-mdpi/ic_launcher.png b/src/id/sektedoujin/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sektedoujin/res/mipmap-mdpi/ic_launcher.png
rename to src/id/sektedoujin/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sektedoujin/res/mipmap-xhdpi/ic_launcher.png b/src/id/sektedoujin/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sektedoujin/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/sektedoujin/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sektedoujin/res/mipmap-xxhdpi/ic_launcher.png b/src/id/sektedoujin/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sektedoujin/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/sektedoujin/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sektedoujin/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/sektedoujin/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sektedoujin/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/sektedoujin/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sektedoujin/src/SekteDoujin.kt b/src/id/sektedoujin/src/eu/kanade/tachiyomi/extension/id/sektedoujin/SekteDoujin.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/sektedoujin/src/SekteDoujin.kt
rename to src/id/sektedoujin/src/eu/kanade/tachiyomi/extension/id/sektedoujin/SekteDoujin.kt
diff --git a/src/id/sektekomik/build.gradle b/src/id/sektekomik/build.gradle
new file mode 100644
index 000000000..8b4f449e4
--- /dev/null
+++ b/src/id/sektekomik/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sekte Komik'
+ extClass = '.SekteKomik'
+ themePkg = 'colorlibanime'
+ baseUrl = 'https://sektekomik.xyz'
+ overrideVersionCode = 26
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/colorlibanime/sektekomik/res/mipmap-hdpi/ic_launcher.png b/src/id/sektekomik/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/sektekomik/res/mipmap-hdpi/ic_launcher.png
rename to src/id/sektekomik/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/sektekomik/res/mipmap-mdpi/ic_launcher.png b/src/id/sektekomik/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/sektekomik/res/mipmap-mdpi/ic_launcher.png
rename to src/id/sektekomik/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/sektekomik/res/mipmap-xhdpi/ic_launcher.png b/src/id/sektekomik/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/sektekomik/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/sektekomik/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/sektekomik/res/mipmap-xxhdpi/ic_launcher.png b/src/id/sektekomik/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/sektekomik/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/sektekomik/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colorlibanime/sektekomik/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/sektekomik/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colorlibanime/sektekomik/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/sektekomik/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/id/sektekomik/src/eu/kanade/tachiyomi/extension/id/sektekomik/SekteKomik.kt b/src/id/sektekomik/src/eu/kanade/tachiyomi/extension/id/sektekomik/SekteKomik.kt
new file mode 100644
index 000000000..e24c9f670
--- /dev/null
+++ b/src/id/sektekomik/src/eu/kanade/tachiyomi/extension/id/sektekomik/SekteKomik.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.id.sektekomik
+
+import eu.kanade.tachiyomi.multisrc.colorlibanime.ColorlibAnime
+
+class SekteKomik : ColorlibAnime("Sekte Komik", "https://sektekomik.xyz", "id")
diff --git a/src/id/sheamanga/build.gradle b/src/id/sheamanga/build.gradle
new file mode 100644
index 000000000..93a851688
--- /dev/null
+++ b/src/id/sheamanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Shea Manga'
+ extClass = '.SheaManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://sheakomik.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/sheamanga/res/mipmap-hdpi/ic_launcher.png b/src/id/sheamanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sheamanga/res/mipmap-hdpi/ic_launcher.png
rename to src/id/sheamanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sheamanga/res/mipmap-mdpi/ic_launcher.png b/src/id/sheamanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sheamanga/res/mipmap-mdpi/ic_launcher.png
rename to src/id/sheamanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sheamanga/res/mipmap-xhdpi/ic_launcher.png b/src/id/sheamanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sheamanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/sheamanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sheamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/id/sheamanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sheamanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/sheamanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sheamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/sheamanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sheamanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/sheamanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sheamanga/src/SheaManga.kt b/src/id/sheamanga/src/eu/kanade/tachiyomi/extension/id/sheamanga/SheaManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/sheamanga/src/SheaManga.kt
rename to src/id/sheamanga/src/eu/kanade/tachiyomi/extension/id/sheamanga/SheaManga.kt
diff --git a/src/id/shinigami/build.gradle b/src/id/shinigami/build.gradle
new file mode 100644
index 000000000..18bece0eb
--- /dev/null
+++ b/src/id/shinigami/build.gradle
@@ -0,0 +1,14 @@
+ext {
+ extName = 'Shinigami'
+ extClass = '.Shinigami'
+ themePkg = 'madara'
+ baseUrl = 'https://shinigamitoon.com'
+ overrideVersionCode = 16
+}
+
+apply from: "$rootDir/common.gradle"
+
+dependencies {
+ implementation(project(":lib:synchrony"))
+ implementation(project(":lib:cryptoaes"))
+}
diff --git a/multisrc/overrides/madara/shinigami/res/mipmap-hdpi/ic_launcher.png b/src/id/shinigami/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shinigami/res/mipmap-hdpi/ic_launcher.png
rename to src/id/shinigami/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shinigami/res/mipmap-mdpi/ic_launcher.png b/src/id/shinigami/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shinigami/res/mipmap-mdpi/ic_launcher.png
rename to src/id/shinigami/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shinigami/res/mipmap-xhdpi/ic_launcher.png b/src/id/shinigami/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shinigami/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/shinigami/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shinigami/res/mipmap-xxhdpi/ic_launcher.png b/src/id/shinigami/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shinigami/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/shinigami/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shinigami/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/shinigami/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shinigami/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/shinigami/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shinigami/src/Shinigami.kt b/src/id/shinigami/src/eu/kanade/tachiyomi/extension/id/shinigami/Shinigami.kt
similarity index 100%
rename from multisrc/overrides/madara/shinigami/src/Shinigami.kt
rename to src/id/shinigami/src/eu/kanade/tachiyomi/extension/id/shinigami/Shinigami.kt
diff --git a/src/id/shirakami/build.gradle b/src/id/shirakami/build.gradle
new file mode 100644
index 000000000..a7014cdd0
--- /dev/null
+++ b/src/id/shirakami/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Shirakami'
+ extClass = '.Shirakami'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://shirakami.xyz'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/shirakami/res/mipmap-hdpi/ic_launcher.png b/src/id/shirakami/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/shirakami/res/mipmap-hdpi/ic_launcher.png
rename to src/id/shirakami/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/shirakami/res/mipmap-mdpi/ic_launcher.png b/src/id/shirakami/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/shirakami/res/mipmap-mdpi/ic_launcher.png
rename to src/id/shirakami/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/shirakami/res/mipmap-xhdpi/ic_launcher.png b/src/id/shirakami/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/shirakami/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/shirakami/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/shirakami/res/mipmap-xxhdpi/ic_launcher.png b/src/id/shirakami/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/shirakami/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/shirakami/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/shirakami/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/shirakami/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/shirakami/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/shirakami/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/shirakami/src/Shirakami.kt b/src/id/shirakami/src/eu/kanade/tachiyomi/extension/id/shirakami/Shirakami.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/shirakami/src/Shirakami.kt
rename to src/id/shirakami/src/eu/kanade/tachiyomi/extension/id/shirakami/Shirakami.kt
diff --git a/src/id/shirodoujin/build.gradle b/src/id/shirodoujin/build.gradle
new file mode 100644
index 000000000..27438d63f
--- /dev/null
+++ b/src/id/shirodoujin/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ShiroDoujin'
+ extClass = '.Shirodoujin'
+ themePkg = 'zmanga'
+ baseUrl = 'https://shirodoujin.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zmanga/shirodoujin/res/mipmap-hdpi/ic_launcher.png b/src/id/shirodoujin/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/shirodoujin/res/mipmap-hdpi/ic_launcher.png
rename to src/id/shirodoujin/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/shirodoujin/res/mipmap-mdpi/ic_launcher.png b/src/id/shirodoujin/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/shirodoujin/res/mipmap-mdpi/ic_launcher.png
rename to src/id/shirodoujin/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/shirodoujin/res/mipmap-xhdpi/ic_launcher.png b/src/id/shirodoujin/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/shirodoujin/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/shirodoujin/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/shirodoujin/res/mipmap-xxhdpi/ic_launcher.png b/src/id/shirodoujin/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/shirodoujin/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/shirodoujin/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/shirodoujin/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/shirodoujin/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zmanga/shirodoujin/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/shirodoujin/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zmanga/shirodoujin/src/Shirodoujin.kt b/src/id/shirodoujin/src/eu/kanade/tachiyomi/extension/id/shirodoujin/Shirodoujin.kt
similarity index 100%
rename from multisrc/overrides/zmanga/shirodoujin/src/Shirodoujin.kt
rename to src/id/shirodoujin/src/eu/kanade/tachiyomi/extension/id/shirodoujin/Shirodoujin.kt
diff --git a/src/id/shiyurasub/build.gradle b/src/id/shiyurasub/build.gradle
new file mode 100644
index 000000000..90789be9d
--- /dev/null
+++ b/src/id/shiyurasub/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ShiyuraSub'
+ extClass = '.ShiyuraSub'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://shiyurasub.blogspot.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/shiyurasub/res/mipmap-hdpi/ic_launcher.png b/src/id/shiyurasub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/shiyurasub/res/mipmap-hdpi/ic_launcher.png
rename to src/id/shiyurasub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/shiyurasub/res/mipmap-mdpi/ic_launcher.png b/src/id/shiyurasub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/shiyurasub/res/mipmap-mdpi/ic_launcher.png
rename to src/id/shiyurasub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/shiyurasub/res/mipmap-xhdpi/ic_launcher.png b/src/id/shiyurasub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/shiyurasub/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/shiyurasub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/shiyurasub/res/mipmap-xxhdpi/ic_launcher.png b/src/id/shiyurasub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/shiyurasub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/shiyurasub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/shiyurasub/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/shiyurasub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/shiyurasub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/shiyurasub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/shiyurasub/src/ShiyuraSub.kt b/src/id/shiyurasub/src/eu/kanade/tachiyomi/extension/id/shiyurasub/ShiyuraSub.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/shiyurasub/src/ShiyuraSub.kt
rename to src/id/shiyurasub/src/eu/kanade/tachiyomi/extension/id/shiyurasub/ShiyuraSub.kt
diff --git a/src/id/sisigelap/build.gradle b/src/id/sisigelap/build.gradle
new file mode 100644
index 000000000..cd7c33ef5
--- /dev/null
+++ b/src/id/sisigelap/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'SISI GELAP'
+ extClass = '.SISIGELAP'
+ themePkg = 'madara'
+ baseUrl = 'https://sigel.asia'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/sisigelap/res/mipmap-hdpi/ic_launcher.png b/src/id/sisigelap/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sisigelap/res/mipmap-hdpi/ic_launcher.png
rename to src/id/sisigelap/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sisigelap/res/mipmap-mdpi/ic_launcher.png b/src/id/sisigelap/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sisigelap/res/mipmap-mdpi/ic_launcher.png
rename to src/id/sisigelap/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sisigelap/res/mipmap-xhdpi/ic_launcher.png b/src/id/sisigelap/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sisigelap/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/sisigelap/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sisigelap/res/mipmap-xxhdpi/ic_launcher.png b/src/id/sisigelap/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sisigelap/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/sisigelap/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sisigelap/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/sisigelap/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sisigelap/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/sisigelap/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/id/sisigelap/src/eu/kanade/tachiyomi/extension/id/sisigelap/SISIGELAP.kt b/src/id/sisigelap/src/eu/kanade/tachiyomi/extension/id/sisigelap/SISIGELAP.kt
new file mode 100644
index 000000000..78ddb8611
--- /dev/null
+++ b/src/id/sisigelap/src/eu/kanade/tachiyomi/extension/id/sisigelap/SISIGELAP.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.id.sisigelap
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class SISIGELAP : Madara("SISI GELAP", "https://sigel.asia", "id")
diff --git a/src/id/soulscans/build.gradle b/src/id/soulscans/build.gradle
new file mode 100644
index 000000000..5b9c0cf49
--- /dev/null
+++ b/src/id/soulscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Soul Scans'
+ extClass = '.SoulScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://soulscans.my.id'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/soulscans/res/mipmap-hdpi/ic_launcher.png b/src/id/soulscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/soulscans/res/mipmap-hdpi/ic_launcher.png
rename to src/id/soulscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/soulscans/res/mipmap-mdpi/ic_launcher.png b/src/id/soulscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/soulscans/res/mipmap-mdpi/ic_launcher.png
rename to src/id/soulscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/soulscans/res/mipmap-xhdpi/ic_launcher.png b/src/id/soulscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/soulscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/soulscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/soulscans/res/mipmap-xxhdpi/ic_launcher.png b/src/id/soulscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/soulscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/soulscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/soulscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/soulscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/soulscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/soulscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/soulscans/src/SoulScans.kt b/src/id/soulscans/src/eu/kanade/tachiyomi/extension/id/soulscans/SoulScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/soulscans/src/SoulScans.kt
rename to src/id/soulscans/src/eu/kanade/tachiyomi/extension/id/soulscans/SoulScans.kt
diff --git a/src/id/tooncubus/build.gradle b/src/id/tooncubus/build.gradle
new file mode 100644
index 000000000..489354f60
--- /dev/null
+++ b/src/id/tooncubus/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Tooncubus'
+ extClass = '.Tooncubus'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://www.tooncubus.top'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/tooncubus/res/mipmap-hdpi/ic_launcher.png b/src/id/tooncubus/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/tooncubus/res/mipmap-hdpi/ic_launcher.png
rename to src/id/tooncubus/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/tooncubus/res/mipmap-mdpi/ic_launcher.png b/src/id/tooncubus/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/tooncubus/res/mipmap-mdpi/ic_launcher.png
rename to src/id/tooncubus/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/tooncubus/res/mipmap-xhdpi/ic_launcher.png b/src/id/tooncubus/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/tooncubus/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/tooncubus/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/tooncubus/res/mipmap-xxhdpi/ic_launcher.png b/src/id/tooncubus/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/tooncubus/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/tooncubus/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/tooncubus/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/tooncubus/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/tooncubus/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/tooncubus/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/tooncubus/src/Tooncubus.kt b/src/id/tooncubus/src/eu/kanade/tachiyomi/extension/id/tooncubus/Tooncubus.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/tooncubus/src/Tooncubus.kt
rename to src/id/tooncubus/src/eu/kanade/tachiyomi/extension/id/tooncubus/Tooncubus.kt
diff --git a/src/id/tukangkomik/build.gradle b/src/id/tukangkomik/build.gradle
new file mode 100644
index 000000000..b434eebd8
--- /dev/null
+++ b/src/id/tukangkomik/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'TukangKomik'
+ extClass = '.TukangKomik'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://tukangkomik.id'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/tukangkomik/res/mipmap-hdpi/ic_launcher.png b/src/id/tukangkomik/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tukangkomik/res/mipmap-hdpi/ic_launcher.png
rename to src/id/tukangkomik/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tukangkomik/res/mipmap-mdpi/ic_launcher.png b/src/id/tukangkomik/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tukangkomik/res/mipmap-mdpi/ic_launcher.png
rename to src/id/tukangkomik/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tukangkomik/res/mipmap-xhdpi/ic_launcher.png b/src/id/tukangkomik/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tukangkomik/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/tukangkomik/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tukangkomik/res/mipmap-xxhdpi/ic_launcher.png b/src/id/tukangkomik/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tukangkomik/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/tukangkomik/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tukangkomik/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/tukangkomik/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tukangkomik/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/tukangkomik/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/id/tukangkomik/src/eu/kanade/tachiyomi/extension/id/tukangkomik/TukangKomik.kt b/src/id/tukangkomik/src/eu/kanade/tachiyomi/extension/id/tukangkomik/TukangKomik.kt
new file mode 100644
index 000000000..103f526da
--- /dev/null
+++ b/src/id/tukangkomik/src/eu/kanade/tachiyomi/extension/id/tukangkomik/TukangKomik.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.id.tukangkomik
+
+import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
+
+class TukangKomik : MangaThemesia("TukangKomik", "https://tukangkomik.id", "id")
diff --git a/src/id/westmanga/build.gradle b/src/id/westmanga/build.gradle
new file mode 100644
index 000000000..d0c399a9b
--- /dev/null
+++ b/src/id/westmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'West Manga'
+ extClass = '.WestManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://westmanga.fun'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/westmanga/res/mipmap-hdpi/ic_launcher.png b/src/id/westmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/westmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/id/westmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/westmanga/res/mipmap-mdpi/ic_launcher.png b/src/id/westmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/westmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/id/westmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/westmanga/res/mipmap-xhdpi/ic_launcher.png b/src/id/westmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/westmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/westmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/westmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/id/westmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/westmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/westmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/westmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/westmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/westmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/westmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/westmanga/src/WestManga.kt b/src/id/westmanga/src/eu/kanade/tachiyomi/extension/id/westmanga/WestManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/westmanga/src/WestManga.kt
rename to src/id/westmanga/src/eu/kanade/tachiyomi/extension/id/westmanga/WestManga.kt
diff --git a/src/id/worldmanhwas/build.gradle b/src/id/worldmanhwas/build.gradle
new file mode 100644
index 000000000..e45b45d54
--- /dev/null
+++ b/src/id/worldmanhwas/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'WorldManhwas'
+ extClass = '.WorldManhwas'
+ themePkg = 'madara'
+ baseUrl = 'https://worldmanhwas.zone'
+ overrideVersionCode = 3
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/worldmanhwas/res/mipmap-hdpi/ic_launcher.png b/src/id/worldmanhwas/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/worldmanhwas/res/mipmap-hdpi/ic_launcher.png
rename to src/id/worldmanhwas/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/worldmanhwas/res/mipmap-mdpi/ic_launcher.png b/src/id/worldmanhwas/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/worldmanhwas/res/mipmap-mdpi/ic_launcher.png
rename to src/id/worldmanhwas/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/worldmanhwas/res/mipmap-xhdpi/ic_launcher.png b/src/id/worldmanhwas/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/worldmanhwas/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/worldmanhwas/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/worldmanhwas/res/mipmap-xxhdpi/ic_launcher.png b/src/id/worldmanhwas/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/worldmanhwas/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/worldmanhwas/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/worldmanhwas/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/worldmanhwas/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/worldmanhwas/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/worldmanhwas/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/worldmanhwas/src/WorldManhwas.kt b/src/id/worldmanhwas/src/eu/kanade/tachiyomi/extension/id/worldmanhwas/WorldManhwas.kt
similarity index 100%
rename from multisrc/overrides/madara/worldmanhwas/src/WorldManhwas.kt
rename to src/id/worldmanhwas/src/eu/kanade/tachiyomi/extension/id/worldmanhwas/WorldManhwas.kt
diff --git a/src/id/yuramanga/build.gradle b/src/id/yuramanga/build.gradle
new file mode 100644
index 000000000..f25a15f66
--- /dev/null
+++ b/src/id/yuramanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'YuraManga'
+ extClass = '.YuraManga'
+ themePkg = 'makaru'
+ baseUrl = 'https://www.yuramanga.my.id'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/makaru/yuramanga/res/mipmap-hdpi/ic_launcher.png b/src/id/yuramanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/yuramanga/res/mipmap-hdpi/ic_launcher.png
rename to src/id/yuramanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/makaru/yuramanga/res/mipmap-mdpi/ic_launcher.png b/src/id/yuramanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/yuramanga/res/mipmap-mdpi/ic_launcher.png
rename to src/id/yuramanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/makaru/yuramanga/res/mipmap-xhdpi/ic_launcher.png b/src/id/yuramanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/yuramanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/id/yuramanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/makaru/yuramanga/res/mipmap-xxhdpi/ic_launcher.png b/src/id/yuramanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/yuramanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/id/yuramanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/makaru/yuramanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/yuramanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/makaru/yuramanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/id/yuramanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/id/yuramanga/src/eu/kanade/tachiyomi/extension/id/yuramanga/YuraManga.kt b/src/id/yuramanga/src/eu/kanade/tachiyomi/extension/id/yuramanga/YuraManga.kt
new file mode 100644
index 000000000..0f8a1b265
--- /dev/null
+++ b/src/id/yuramanga/src/eu/kanade/tachiyomi/extension/id/yuramanga/YuraManga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.id.yuramanga
+
+import eu.kanade.tachiyomi.multisrc.makaru.Makaru
+
+class YuraManga : Makaru("YuraManga", "https://www.yuramanga.my.id", "id")
diff --git a/src/it/gto/build.gradle b/src/it/gto/build.gradle
new file mode 100644
index 000000000..899ed9953
--- /dev/null
+++ b/src/it/gto/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'GTO The Great Site'
+ extClass = '.GTO'
+ themePkg = 'pizzareader'
+ baseUrl = 'https://reader.gtothegreatsite.net'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/pizzareader/gto/res/mipmap-hdpi/ic_launcher.png b/src/it/gto/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/gto/res/mipmap-hdpi/ic_launcher.png
rename to src/it/gto/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/gto/res/mipmap-mdpi/ic_launcher.png b/src/it/gto/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/gto/res/mipmap-mdpi/ic_launcher.png
rename to src/it/gto/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/gto/res/mipmap-xhdpi/ic_launcher.png b/src/it/gto/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/gto/res/mipmap-xhdpi/ic_launcher.png
rename to src/it/gto/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/gto/res/mipmap-xxhdpi/ic_launcher.png b/src/it/gto/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/gto/res/mipmap-xxhdpi/ic_launcher.png
rename to src/it/gto/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/gto/res/mipmap-xxxhdpi/ic_launcher.png b/src/it/gto/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/gto/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/it/gto/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/gto/src/GTO.kt b/src/it/gto/src/eu/kanade/tachiyomi/extension/it/gto/GTO.kt
similarity index 100%
rename from multisrc/overrides/pizzareader/gto/src/GTO.kt
rename to src/it/gto/src/eu/kanade/tachiyomi/extension/it/gto/GTO.kt
diff --git a/src/it/lupiteam/build.gradle b/src/it/lupiteam/build.gradle
new file mode 100644
index 000000000..3ad8cdb72
--- /dev/null
+++ b/src/it/lupiteam/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'LupiTeam'
+ extClass = '.LupiTeam'
+ themePkg = 'pizzareader'
+ baseUrl = 'https://lupiteam.net'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/pizzareader/lupiteam/res/mipmap-hdpi/ic_launcher.png b/src/it/lupiteam/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/lupiteam/res/mipmap-hdpi/ic_launcher.png
rename to src/it/lupiteam/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/lupiteam/res/mipmap-mdpi/ic_launcher.png b/src/it/lupiteam/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/lupiteam/res/mipmap-mdpi/ic_launcher.png
rename to src/it/lupiteam/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/lupiteam/res/mipmap-xhdpi/ic_launcher.png b/src/it/lupiteam/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/lupiteam/res/mipmap-xhdpi/ic_launcher.png
rename to src/it/lupiteam/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/lupiteam/res/mipmap-xxhdpi/ic_launcher.png b/src/it/lupiteam/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/lupiteam/res/mipmap-xxhdpi/ic_launcher.png
rename to src/it/lupiteam/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/lupiteam/res/mipmap-xxxhdpi/ic_launcher.png b/src/it/lupiteam/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/lupiteam/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/it/lupiteam/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/lupiteam/src/LupiTeam.kt b/src/it/lupiteam/src/eu/kanade/tachiyomi/extension/it/lupiteam/LupiTeam.kt
similarity index 100%
rename from multisrc/overrides/pizzareader/lupiteam/src/LupiTeam.kt
rename to src/it/lupiteam/src/eu/kanade/tachiyomi/extension/it/lupiteam/LupiTeam.kt
diff --git a/src/it/mangaworld/build.gradle b/src/it/mangaworld/build.gradle
new file mode 100644
index 000000000..1632c5026
--- /dev/null
+++ b/src/it/mangaworld/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangaworld'
+ extClass = '.Mangaworld'
+ themePkg = 'mangaworld'
+ baseUrl = 'https://www.mangaworld.ac'
+ overrideVersionCode = 6
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/it/mangaworld/src/eu/kanade/tachiyomi/extension/it/mangaworld/Mangaworld.kt b/src/it/mangaworld/src/eu/kanade/tachiyomi/extension/it/mangaworld/Mangaworld.kt
new file mode 100644
index 000000000..98271893b
--- /dev/null
+++ b/src/it/mangaworld/src/eu/kanade/tachiyomi/extension/it/mangaworld/Mangaworld.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.it.mangaworld
+
+import eu.kanade.tachiyomi.multisrc.mangaworld.MangaWorld
+
+class Mangaworld : MangaWorld("Mangaworld", "https://www.mangaworld.ac", "it")
diff --git a/src/it/mangaworldadult/build.gradle b/src/it/mangaworldadult/build.gradle
new file mode 100644
index 000000000..042563d21
--- /dev/null
+++ b/src/it/mangaworldadult/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaworldAdult'
+ extClass = '.MangaworldAdult'
+ themePkg = 'mangaworld'
+ baseUrl = 'https://www.mangaworldadult.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/it/mangaworldadult/src/eu/kanade/tachiyomi/extension/it/mangaworldadult/MangaworldAdult.kt b/src/it/mangaworldadult/src/eu/kanade/tachiyomi/extension/it/mangaworldadult/MangaworldAdult.kt
new file mode 100644
index 000000000..9edf32169
--- /dev/null
+++ b/src/it/mangaworldadult/src/eu/kanade/tachiyomi/extension/it/mangaworldadult/MangaworldAdult.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.it.mangaworldadult
+
+import eu.kanade.tachiyomi.multisrc.mangaworld.MangaWorld
+
+class MangaworldAdult : MangaWorld("MangaworldAdult", "https://www.mangaworldadult.com", "it")
diff --git a/src/it/nifteam/build.gradle b/src/it/nifteam/build.gradle
new file mode 100644
index 000000000..5416c23d2
--- /dev/null
+++ b/src/it/nifteam/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'NIFTeam'
+ extClass = '.NIFTeam'
+ themePkg = 'foolslide'
+ baseUrl = 'http://read-nifteam.info'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/foolslide/nifteam/res/mipmap-hdpi/ic_launcher.png b/src/it/nifteam/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/nifteam/res/mipmap-hdpi/ic_launcher.png
rename to src/it/nifteam/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/nifteam/res/mipmap-mdpi/ic_launcher.png b/src/it/nifteam/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/nifteam/res/mipmap-mdpi/ic_launcher.png
rename to src/it/nifteam/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/nifteam/res/mipmap-xhdpi/ic_launcher.png b/src/it/nifteam/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/nifteam/res/mipmap-xhdpi/ic_launcher.png
rename to src/it/nifteam/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/nifteam/res/mipmap-xxhdpi/ic_launcher.png b/src/it/nifteam/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/nifteam/res/mipmap-xxhdpi/ic_launcher.png
rename to src/it/nifteam/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/nifteam/res/mipmap-xxxhdpi/ic_launcher.png b/src/it/nifteam/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/nifteam/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/it/nifteam/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/nifteam/src/NIFTeam.kt b/src/it/nifteam/src/eu/kanade/tachiyomi/extension/it/nifteam/NIFTeam.kt
similarity index 100%
rename from multisrc/overrides/foolslide/nifteam/src/NIFTeam.kt
rename to src/it/nifteam/src/eu/kanade/tachiyomi/extension/it/nifteam/NIFTeam.kt
diff --git a/src/it/phoenixscans/build.gradle b/src/it/phoenixscans/build.gradle
new file mode 100644
index 000000000..b695aae32
--- /dev/null
+++ b/src/it/phoenixscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Phoenix Scans'
+ extClass = '.PhoenixScans'
+ themePkg = 'pizzareader'
+ baseUrl = 'https://www.phoenixscans.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/pizzareader/phoenixscans/res/mipmap-hdpi/ic_launcher.png b/src/it/phoenixscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/phoenixscans/res/mipmap-hdpi/ic_launcher.png
rename to src/it/phoenixscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/phoenixscans/res/mipmap-mdpi/ic_launcher.png b/src/it/phoenixscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/phoenixscans/res/mipmap-mdpi/ic_launcher.png
rename to src/it/phoenixscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/phoenixscans/res/mipmap-xhdpi/ic_launcher.png b/src/it/phoenixscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/phoenixscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/it/phoenixscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/phoenixscans/res/mipmap-xxhdpi/ic_launcher.png b/src/it/phoenixscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/phoenixscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/it/phoenixscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/phoenixscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/it/phoenixscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/phoenixscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/it/phoenixscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/phoenixscans/src/PhoenixScans.kt b/src/it/phoenixscans/src/eu/kanade/tachiyomi/extension/it/phoenixscans/PhoenixScans.kt
similarity index 100%
rename from multisrc/overrides/pizzareader/phoenixscans/src/PhoenixScans.kt
rename to src/it/phoenixscans/src/eu/kanade/tachiyomi/extension/it/phoenixscans/PhoenixScans.kt
diff --git a/src/it/rama/build.gradle b/src/it/rama/build.gradle
new file mode 100644
index 000000000..23770a336
--- /dev/null
+++ b/src/it/rama/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Rama'
+ extClass = '.Rama'
+ themePkg = 'foolslide'
+ baseUrl = 'https://www.ramareader.it'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/foolslide/rama/res/mipmap-hdpi/ic_launcher.png b/src/it/rama/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/rama/res/mipmap-hdpi/ic_launcher.png
rename to src/it/rama/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/rama/res/mipmap-mdpi/ic_launcher.png b/src/it/rama/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/rama/res/mipmap-mdpi/ic_launcher.png
rename to src/it/rama/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/rama/res/mipmap-xhdpi/ic_launcher.png b/src/it/rama/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/rama/res/mipmap-xhdpi/ic_launcher.png
rename to src/it/rama/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/rama/res/mipmap-xxhdpi/ic_launcher.png b/src/it/rama/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/rama/res/mipmap-xxhdpi/ic_launcher.png
rename to src/it/rama/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/rama/res/mipmap-xxxhdpi/ic_launcher.png b/src/it/rama/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/foolslide/rama/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/it/rama/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/foolslide/rama/src/Rama.kt b/src/it/rama/src/eu/kanade/tachiyomi/extension/it/rama/Rama.kt
similarity index 100%
rename from multisrc/overrides/foolslide/rama/src/Rama.kt
rename to src/it/rama/src/eu/kanade/tachiyomi/extension/it/rama/Rama.kt
diff --git a/src/it/shavelproiection/build.gradle b/src/it/shavelproiection/build.gradle
new file mode 100644
index 000000000..670858d07
--- /dev/null
+++ b/src/it/shavelproiection/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ShavelProiection'
+ extClass = '.ShavelProiection'
+ themePkg = 'madara'
+ baseUrl = 'https://www.shavelproiection.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/shavelproiection/res/mipmap-hdpi/ic_launcher.png b/src/it/shavelproiection/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shavelproiection/res/mipmap-hdpi/ic_launcher.png
rename to src/it/shavelproiection/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shavelproiection/res/mipmap-mdpi/ic_launcher.png b/src/it/shavelproiection/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shavelproiection/res/mipmap-mdpi/ic_launcher.png
rename to src/it/shavelproiection/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shavelproiection/res/mipmap-xhdpi/ic_launcher.png b/src/it/shavelproiection/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shavelproiection/res/mipmap-xhdpi/ic_launcher.png
rename to src/it/shavelproiection/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shavelproiection/res/mipmap-xxhdpi/ic_launcher.png b/src/it/shavelproiection/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shavelproiection/res/mipmap-xxhdpi/ic_launcher.png
rename to src/it/shavelproiection/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shavelproiection/res/mipmap-xxxhdpi/ic_launcher.png b/src/it/shavelproiection/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/shavelproiection/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/it/shavelproiection/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/shavelproiection/src/ShavelProiection.kt b/src/it/shavelproiection/src/eu/kanade/tachiyomi/extension/it/shavelproiection/ShavelProiection.kt
similarity index 100%
rename from multisrc/overrides/madara/shavelproiection/src/ShavelProiection.kt
rename to src/it/shavelproiection/src/eu/kanade/tachiyomi/extension/it/shavelproiection/ShavelProiection.kt
diff --git a/src/it/tuttoanimemanga/build.gradle b/src/it/tuttoanimemanga/build.gradle
new file mode 100644
index 000000000..dce4b3664
--- /dev/null
+++ b/src/it/tuttoanimemanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'TuttoAnimeManga'
+ extClass = '.TuttoAnimeManga'
+ themePkg = 'pizzareader'
+ baseUrl = 'https://tuttoanimemanga.net'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/pizzareader/tuttoanimemanga/res/mipmap-hdpi/ic_launcher.png b/src/it/tuttoanimemanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/tuttoanimemanga/res/mipmap-hdpi/ic_launcher.png
rename to src/it/tuttoanimemanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/tuttoanimemanga/res/mipmap-mdpi/ic_launcher.png b/src/it/tuttoanimemanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/tuttoanimemanga/res/mipmap-mdpi/ic_launcher.png
rename to src/it/tuttoanimemanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/tuttoanimemanga/res/mipmap-xhdpi/ic_launcher.png b/src/it/tuttoanimemanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/tuttoanimemanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/it/tuttoanimemanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/tuttoanimemanga/res/mipmap-xxhdpi/ic_launcher.png b/src/it/tuttoanimemanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/tuttoanimemanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/it/tuttoanimemanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/tuttoanimemanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/it/tuttoanimemanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/pizzareader/tuttoanimemanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/it/tuttoanimemanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/pizzareader/tuttoanimemanga/src/TuttoAnimeManga.kt b/src/it/tuttoanimemanga/src/eu/kanade/tachiyomi/extension/it/tuttoanimemanga/TuttoAnimeManga.kt
similarity index 100%
rename from multisrc/overrides/pizzareader/tuttoanimemanga/src/TuttoAnimeManga.kt
rename to src/it/tuttoanimemanga/src/eu/kanade/tachiyomi/extension/it/tuttoanimemanga/TuttoAnimeManga.kt
diff --git a/src/it/walpurgisscan/build.gradle b/src/it/walpurgisscan/build.gradle
new file mode 100644
index 000000000..b75312bac
--- /dev/null
+++ b/src/it/walpurgisscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Walpurgi Scan'
+ extClass = '.WalpurgisScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://www.walpurgiscan.it'
+ overrideVersionCode = 7
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/walpurgisscan/res/mipmap-hdpi/ic_launcher.png b/src/it/walpurgisscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/walpurgisscan/res/mipmap-hdpi/ic_launcher.png
rename to src/it/walpurgisscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/walpurgisscan/res/mipmap-mdpi/ic_launcher.png b/src/it/walpurgisscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/walpurgisscan/res/mipmap-mdpi/ic_launcher.png
rename to src/it/walpurgisscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/walpurgisscan/res/mipmap-xhdpi/ic_launcher.png b/src/it/walpurgisscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/walpurgisscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/it/walpurgisscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/walpurgisscan/res/mipmap-xxhdpi/ic_launcher.png b/src/it/walpurgisscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/walpurgisscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/it/walpurgisscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/walpurgisscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/it/walpurgisscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/walpurgisscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/it/walpurgisscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/walpurgisscan/src/WalpurgisScan.kt b/src/it/walpurgisscan/src/eu/kanade/tachiyomi/extension/it/walpurgisscan/WalpurgisScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/walpurgisscan/src/WalpurgisScan.kt
rename to src/it/walpurgisscan/src/eu/kanade/tachiyomi/extension/it/walpurgisscan/WalpurgisScan.kt
diff --git a/src/ja/comicdays/build.gradle b/src/ja/comicdays/build.gradle
new file mode 100644
index 000000000..8e59a3d23
--- /dev/null
+++ b/src/ja/comicdays/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Comic Days'
+ extClass = '.ComicDays'
+ themePkg = 'gigaviewer'
+ baseUrl = 'https://comic-days.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-hdpi/ic_launcher.png b/src/ja/comicdays/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comicdays/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/comicdays/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-mdpi/ic_launcher.png b/src/ja/comicdays/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comicdays/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/comicdays/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xhdpi/ic_launcher.png b/src/ja/comicdays/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comicdays/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/comicdays/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/comicdays/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comicdays/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/comicdays/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/comicdays/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comicdays/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/comicdays/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comicdays/src/ComicDays.kt b/src/ja/comicdays/src/eu/kanade/tachiyomi/extension/ja/comicdays/ComicDays.kt
similarity index 100%
rename from multisrc/overrides/gigaviewer/comicdays/src/ComicDays.kt
rename to src/ja/comicdays/src/eu/kanade/tachiyomi/extension/ja/comicdays/ComicDays.kt
diff --git a/src/ja/comicgardo/build.gradle b/src/ja/comicgardo/build.gradle
new file mode 100644
index 000000000..0559b3b62
--- /dev/null
+++ b/src/ja/comicgardo/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Comic Gardo'
+ extClass = '.ComicGardo'
+ themePkg = 'gigaviewer'
+ baseUrl = 'https://comic-gardo.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-hdpi/ic_launcher.png b/src/ja/comicgardo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comicgardo/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/comicgardo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-mdpi/ic_launcher.png b/src/ja/comicgardo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comicgardo/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/comicgardo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xhdpi/ic_launcher.png b/src/ja/comicgardo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/comicgardo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/comicgardo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/comicgardo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/comicgardo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/comicgardo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comicgardo/src/ComicGardo.kt b/src/ja/comicgardo/src/eu/kanade/tachiyomi/extension/ja/comicgardo/ComicGardo.kt
similarity index 100%
rename from multisrc/overrides/gigaviewer/comicgardo/src/ComicGardo.kt
rename to src/ja/comicgardo/src/eu/kanade/tachiyomi/extension/ja/comicgardo/ComicGardo.kt
diff --git a/src/ja/comiplex/build.gradle b/src/ja/comiplex/build.gradle
new file mode 100644
index 000000000..4c49c208a
--- /dev/null
+++ b/src/ja/comiplex/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Comiplex'
+ extClass = '.Comiplex'
+ themePkg = 'gigaviewer'
+ baseUrl = 'https://viewer.heros-web.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-hdpi/ic_launcher.png b/src/ja/comiplex/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comiplex/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/comiplex/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-mdpi/ic_launcher.png b/src/ja/comiplex/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comiplex/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/comiplex/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xhdpi/ic_launcher.png b/src/ja/comiplex/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comiplex/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/comiplex/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/comiplex/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comiplex/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/comiplex/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/comiplex/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/comiplex/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/comiplex/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/comiplex/src/Comiplex.kt b/src/ja/comiplex/src/eu/kanade/tachiyomi/extension/ja/comiplex/Comiplex.kt
similarity index 100%
rename from multisrc/overrides/gigaviewer/comiplex/src/Comiplex.kt
rename to src/ja/comiplex/src/eu/kanade/tachiyomi/extension/ja/comiplex/Comiplex.kt
diff --git a/src/ja/corocoroonline/build.gradle b/src/ja/corocoroonline/build.gradle
new file mode 100644
index 000000000..44b0c386c
--- /dev/null
+++ b/src/ja/corocoroonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Corocoro Online'
+ extClass = '.CorocoroOnline'
+ themePkg = 'gigaviewer'
+ baseUrl = 'https://corocoro.jp'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-hdpi/ic_launcher.png b/src/ja/corocoroonline/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/corocoroonline/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-mdpi/ic_launcher.png b/src/ja/corocoroonline/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/corocoroonline/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xhdpi/ic_launcher.png b/src/ja/corocoroonline/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/corocoroonline/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/corocoroonline/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/corocoroonline/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/corocoroonline/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/corocoroonline/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/corocoroonline/src/CorocoroOnline.kt b/src/ja/corocoroonline/src/eu/kanade/tachiyomi/extension/ja/corocoroonline/CorocoroOnline.kt
similarity index 100%
rename from multisrc/overrides/gigaviewer/corocoroonline/src/CorocoroOnline.kt
rename to src/ja/corocoroonline/src/eu/kanade/tachiyomi/extension/ja/corocoroonline/CorocoroOnline.kt
diff --git a/src/ja/idolgravureprincessdate/build.gradle b/src/ja/idolgravureprincessdate/build.gradle
new file mode 100644
index 000000000..8295c575f
--- /dev/null
+++ b/src/ja/idolgravureprincessdate/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Idol. gravureprincess .date'
+ extClass = '.IdolGravureprincessDate'
+ themePkg = 'gravureblogger'
+ baseUrl = 'https://idol.gravureprincess.date'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gravureblogger/idolgravureprincessdate/res/mipmap-hdpi/ic_launcher.png b/src/ja/idolgravureprincessdate/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gravureblogger/idolgravureprincessdate/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/idolgravureprincessdate/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gravureblogger/idolgravureprincessdate/res/mipmap-mdpi/ic_launcher.png b/src/ja/idolgravureprincessdate/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gravureblogger/idolgravureprincessdate/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/idolgravureprincessdate/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gravureblogger/idolgravureprincessdate/res/mipmap-xhdpi/ic_launcher.png b/src/ja/idolgravureprincessdate/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gravureblogger/idolgravureprincessdate/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/idolgravureprincessdate/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gravureblogger/idolgravureprincessdate/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/idolgravureprincessdate/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gravureblogger/idolgravureprincessdate/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/idolgravureprincessdate/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gravureblogger/idolgravureprincessdate/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/idolgravureprincessdate/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gravureblogger/idolgravureprincessdate/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/idolgravureprincessdate/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gravureblogger/idolgravureprincessdate/src/IdolGravureprincessDate.kt b/src/ja/idolgravureprincessdate/src/eu/kanade/tachiyomi/extension/ja/idolgravureprincessdate/IdolGravureprincessDate.kt
similarity index 100%
rename from multisrc/overrides/gravureblogger/idolgravureprincessdate/src/IdolGravureprincessDate.kt
rename to src/ja/idolgravureprincessdate/src/eu/kanade/tachiyomi/extension/ja/idolgravureprincessdate/IdolGravureprincessDate.kt
diff --git a/src/ja/kisslove/build.gradle b/src/ja/kisslove/build.gradle
new file mode 100644
index 000000000..8e45b5981
--- /dev/null
+++ b/src/ja/kisslove/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'KissLove'
+ extClass = '.KissLove'
+ themePkg = 'fmreader'
+ baseUrl = 'https://klz9.com'
+ overrideVersionCode = 5
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/fmreader/kisslove/res/mipmap-hdpi/ic_launcher.png b/src/ja/kisslove/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/kisslove/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/kisslove/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/kisslove/res/mipmap-mdpi/ic_launcher.png b/src/ja/kisslove/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/kisslove/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/kisslove/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/kisslove/res/mipmap-xhdpi/ic_launcher.png b/src/ja/kisslove/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/kisslove/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/kisslove/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/kisslove/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/kisslove/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/kisslove/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/kisslove/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/kisslove/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/kisslove/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/kisslove/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/kisslove/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/kisslove/src/KissLove.kt b/src/ja/kisslove/src/eu/kanade/tachiyomi/extension/ja/kisslove/KissLove.kt
similarity index 100%
rename from multisrc/overrides/fmreader/kisslove/src/KissLove.kt
rename to src/ja/kisslove/src/eu/kanade/tachiyomi/extension/ja/kisslove/KissLove.kt
diff --git a/src/ja/kuragebunch/build.gradle b/src/ja/kuragebunch/build.gradle
new file mode 100644
index 000000000..d82e8c5eb
--- /dev/null
+++ b/src/ja/kuragebunch/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Kurage Bunch'
+ extClass = '.KurageBunch'
+ themePkg = 'gigaviewer'
+ baseUrl = 'https://kuragebunch.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-hdpi/ic_launcher.png b/src/ja/kuragebunch/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/kuragebunch/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-mdpi/ic_launcher.png b/src/ja/kuragebunch/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/kuragebunch/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xhdpi/ic_launcher.png b/src/ja/kuragebunch/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/kuragebunch/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/kuragebunch/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/kuragebunch/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/kuragebunch/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/kuragebunch/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/kuragebunch/src/KurageBunch.kt b/src/ja/kuragebunch/src/eu/kanade/tachiyomi/extension/ja/kuragebunch/KurageBunch.kt
similarity index 100%
rename from multisrc/overrides/gigaviewer/kuragebunch/src/KurageBunch.kt
rename to src/ja/kuragebunch/src/eu/kanade/tachiyomi/extension/ja/kuragebunch/KurageBunch.kt
diff --git a/src/ja/magazinepocket/build.gradle b/src/ja/magazinepocket/build.gradle
new file mode 100644
index 000000000..f7528ba3e
--- /dev/null
+++ b/src/ja/magazinepocket/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Magazine Pocket'
+ extClass = '.MagazinePocket'
+ themePkg = 'gigaviewer'
+ baseUrl = 'https://pocket.shonenmagazine.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-hdpi/ic_launcher.png b/src/ja/magazinepocket/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/magazinepocket/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-mdpi/ic_launcher.png b/src/ja/magazinepocket/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/magazinepocket/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xhdpi/ic_launcher.png b/src/ja/magazinepocket/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/magazinepocket/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/magazinepocket/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/magazinepocket/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/magazinepocket/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/magazinepocket/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/magazinepocket/src/MagazinePocket.kt b/src/ja/magazinepocket/src/eu/kanade/tachiyomi/extension/ja/magazinepocket/MagazinePocket.kt
similarity index 100%
rename from multisrc/overrides/gigaviewer/magazinepocket/src/MagazinePocket.kt
rename to src/ja/magazinepocket/src/eu/kanade/tachiyomi/extension/ja/magazinepocket/MagazinePocket.kt
diff --git a/src/ja/magcomi/build.gradle b/src/ja/magcomi/build.gradle
new file mode 100644
index 000000000..3b803e637
--- /dev/null
+++ b/src/ja/magcomi/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MAGCOMI'
+ extClass = '.MagComi'
+ themePkg = 'gigaviewer'
+ baseUrl = 'https://magcomi.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-hdpi/ic_launcher.png b/src/ja/magcomi/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/magcomi/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/magcomi/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-mdpi/ic_launcher.png b/src/ja/magcomi/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/magcomi/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/magcomi/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xhdpi/ic_launcher.png b/src/ja/magcomi/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/magcomi/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/magcomi/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/magcomi/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/magcomi/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/magcomi/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/magcomi/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/magcomi/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/magcomi/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/magcomi/src/MagComi.kt b/src/ja/magcomi/src/eu/kanade/tachiyomi/extension/ja/magcomi/MagComi.kt
similarity index 100%
rename from multisrc/overrides/gigaviewer/magcomi/src/MagComi.kt
rename to src/ja/magcomi/src/eu/kanade/tachiyomi/extension/ja/magcomi/MagComi.kt
diff --git a/src/ja/manga1000/build.gradle b/src/ja/manga1000/build.gradle
new file mode 100644
index 000000000..2a57f49df
--- /dev/null
+++ b/src/ja/manga1000/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga1000'
+ extClass = '.Manga1000'
+ themePkg = 'fmreader'
+ baseUrl = 'https://manga1000.top'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/fmreader/manga1000/res/mipmap-hdpi/ic_launcher.png b/src/ja/manga1000/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/manga1000/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/manga1000/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/manga1000/res/mipmap-mdpi/ic_launcher.png b/src/ja/manga1000/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/manga1000/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/manga1000/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/manga1000/res/mipmap-xhdpi/ic_launcher.png b/src/ja/manga1000/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/manga1000/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/manga1000/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/manga1000/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/manga1000/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/manga1000/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/manga1000/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/manga1000/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/manga1000/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/manga1000/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/manga1000/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/manga1000/src/Manga1000.kt b/src/ja/manga1000/src/eu/kanade/tachiyomi/extension/ja/manga1000/Manga1000.kt
similarity index 100%
rename from multisrc/overrides/fmreader/manga1000/src/Manga1000.kt
rename to src/ja/manga1000/src/eu/kanade/tachiyomi/extension/ja/manga1000/Manga1000.kt
diff --git a/src/ja/manga9co/build.gradle b/src/ja/manga9co/build.gradle
new file mode 100644
index 000000000..6438df6db
--- /dev/null
+++ b/src/ja/manga9co/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MangaRaw'
+ extClass = '.MangaRaw'
+ themePkg = 'mangaraw'
+ baseUrl = 'https://manga1001.in'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangaraw/manga9co/res/mipmap-hdpi/ic_launcher.png b/src/ja/manga9co/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaraw/manga9co/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/manga9co/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaraw/manga9co/res/mipmap-mdpi/ic_launcher.png b/src/ja/manga9co/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaraw/manga9co/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/manga9co/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaraw/manga9co/res/mipmap-xhdpi/ic_launcher.png b/src/ja/manga9co/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaraw/manga9co/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/manga9co/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaraw/manga9co/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/manga9co/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaraw/manga9co/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/manga9co/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaraw/manga9co/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/manga9co/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangaraw/manga9co/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/manga9co/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangaraw/manga9co/src/MangaRaw.kt b/src/ja/manga9co/src/eu/kanade/tachiyomi/extension/ja/manga9co/MangaRaw.kt
similarity index 100%
rename from multisrc/overrides/mangaraw/manga9co/src/MangaRaw.kt
rename to src/ja/manga9co/src/eu/kanade/tachiyomi/extension/ja/manga9co/MangaRaw.kt
diff --git a/multisrc/overrides/mangaraw/manga9co/src/MangaRawConstants.kt b/src/ja/manga9co/src/eu/kanade/tachiyomi/extension/ja/manga9co/MangaRawConstants.kt
similarity index 100%
rename from multisrc/overrides/mangaraw/manga9co/src/MangaRawConstants.kt
rename to src/ja/manga9co/src/eu/kanade/tachiyomi/extension/ja/manga9co/MangaRawConstants.kt
diff --git a/src/ja/mangamate/build.gradle b/src/ja/mangamate/build.gradle
new file mode 100644
index 000000000..bd97ce782
--- /dev/null
+++ b/src/ja/mangamate/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga-Mate'
+ extClass = '.MangaMate'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://manga-mate.org'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangamate/src/MangaMate.kt b/src/ja/mangamate/src/eu/kanade/tachiyomi/extension/ja/mangamate/MangaMate.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangamate/src/MangaMate.kt
rename to src/ja/mangamate/src/eu/kanade/tachiyomi/extension/ja/mangamate/MangaMate.kt
diff --git a/src/ja/mangaraworg/build.gradle b/src/ja/mangaraworg/build.gradle
new file mode 100644
index 000000000..e126ba598
--- /dev/null
+++ b/src/ja/mangaraworg/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Raw.org'
+ extClass = '.MangaRawOrg'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangaraw.org'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangaraworg/src/MangaRawOrg.kt b/src/ja/mangaraworg/src/eu/kanade/tachiyomi/extension/ja/mangaraworg/MangaRawOrg.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaraworg/src/MangaRawOrg.kt
rename to src/ja/mangaraworg/src/eu/kanade/tachiyomi/extension/ja/mangaraworg/MangaRawOrg.kt
diff --git a/src/ja/micmicidol/build.gradle b/src/ja/micmicidol/build.gradle
new file mode 100644
index 000000000..5b46cb4e9
--- /dev/null
+++ b/src/ja/micmicidol/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MIC MIC IDOL'
+ extClass = '.MicMicIdol'
+ themePkg = 'gravureblogger'
+ baseUrl = 'https://www.micmicidol.club'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gravureblogger/micmicidol/res/mipmap-hdpi/ic_launcher.png b/src/ja/micmicidol/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gravureblogger/micmicidol/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/micmicidol/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gravureblogger/micmicidol/res/mipmap-mdpi/ic_launcher.png b/src/ja/micmicidol/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gravureblogger/micmicidol/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/micmicidol/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gravureblogger/micmicidol/res/mipmap-xhdpi/ic_launcher.png b/src/ja/micmicidol/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gravureblogger/micmicidol/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/micmicidol/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gravureblogger/micmicidol/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/micmicidol/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gravureblogger/micmicidol/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/micmicidol/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gravureblogger/micmicidol/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/micmicidol/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gravureblogger/micmicidol/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/micmicidol/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gravureblogger/micmicidol/src/MicMicIdol.kt b/src/ja/micmicidol/src/eu/kanade/tachiyomi/extension/ja/micmicidol/MicMicIdol.kt
similarity index 100%
rename from multisrc/overrides/gravureblogger/micmicidol/src/MicMicIdol.kt
rename to src/ja/micmicidol/src/eu/kanade/tachiyomi/extension/ja/micmicidol/MicMicIdol.kt
diff --git a/src/ja/nicomanga/build.gradle b/src/ja/nicomanga/build.gradle
new file mode 100644
index 000000000..81bad4c72
--- /dev/null
+++ b/src/ja/nicomanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Nicomanga'
+ extClass = '.Nicomanga'
+ themePkg = 'fmreader'
+ baseUrl = 'https://nicomanga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/fmreader/nicomanga/res/mipmap-hdpi/ic_launcher.png b/src/ja/nicomanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/nicomanga/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/nicomanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/nicomanga/res/mipmap-mdpi/ic_launcher.png b/src/ja/nicomanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/nicomanga/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/nicomanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/nicomanga/res/mipmap-xhdpi/ic_launcher.png b/src/ja/nicomanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/nicomanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/nicomanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/nicomanga/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/nicomanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/nicomanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/nicomanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/nicomanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/nicomanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/nicomanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/nicomanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/nicomanga/src/Nicomanga.kt b/src/ja/nicomanga/src/eu/kanade/tachiyomi/extension/ja/nicomanga/Nicomanga.kt
similarity index 100%
rename from multisrc/overrides/fmreader/nicomanga/src/Nicomanga.kt
rename to src/ja/nicomanga/src/eu/kanade/tachiyomi/extension/ja/nicomanga/Nicomanga.kt
diff --git a/src/ja/rawkuma/build.gradle b/src/ja/rawkuma/build.gradle
new file mode 100644
index 000000000..8b4845b86
--- /dev/null
+++ b/src/ja/rawkuma/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Rawkuma'
+ extClass = '.Rawkuma'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://rawkuma.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/rawkuma/res/mipmap-hdpi/ic_launcher.png b/src/ja/rawkuma/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/rawkuma/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/rawkuma/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/rawkuma/res/mipmap-mdpi/ic_launcher.png b/src/ja/rawkuma/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/rawkuma/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/rawkuma/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/rawkuma/res/mipmap-xhdpi/ic_launcher.png b/src/ja/rawkuma/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/rawkuma/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/rawkuma/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/rawkuma/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/rawkuma/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/rawkuma/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/rawkuma/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/rawkuma/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/rawkuma/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/rawkuma/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/rawkuma/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/rawkuma/src/Rawkuma.kt b/src/ja/rawkuma/src/eu/kanade/tachiyomi/extension/ja/rawkuma/Rawkuma.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/rawkuma/src/Rawkuma.kt
rename to src/ja/rawkuma/src/eu/kanade/tachiyomi/extension/ja/rawkuma/Rawkuma.kt
diff --git a/src/ja/rawlh/build.gradle b/src/ja/rawlh/build.gradle
new file mode 100644
index 000000000..0941660bb
--- /dev/null
+++ b/src/ja/rawlh/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'WeLoveManga'
+ extClass = '.WeLoveManga'
+ themePkg = 'fmreader'
+ baseUrl = 'https://weloma.art'
+ overrideVersionCode = 5
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/fmreader/rawlh/res/mipmap-hdpi/ic_launcher.png b/src/ja/rawlh/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/rawlh/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/rawlh/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/rawlh/res/mipmap-mdpi/ic_launcher.png b/src/ja/rawlh/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/rawlh/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/rawlh/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/rawlh/res/mipmap-xhdpi/ic_launcher.png b/src/ja/rawlh/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/rawlh/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/rawlh/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/rawlh/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/rawlh/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/rawlh/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/rawlh/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/rawlh/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/rawlh/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/rawlh/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/rawlh/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/rawlh/src/WeLoveManga.kt b/src/ja/rawlh/src/eu/kanade/tachiyomi/extension/ja/rawlh/WeLoveManga.kt
similarity index 100%
rename from multisrc/overrides/fmreader/rawlh/src/WeLoveManga.kt
rename to src/ja/rawlh/src/eu/kanade/tachiyomi/extension/ja/rawlh/WeLoveManga.kt
diff --git a/src/ja/rawotaku/build.gradle b/src/ja/rawotaku/build.gradle
new file mode 100644
index 000000000..7d72c0012
--- /dev/null
+++ b/src/ja/rawotaku/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Raw Otaku'
+ extClass = '.RawOtaku'
+ themePkg = 'mangareader'
+ baseUrl = 'https://rawotaku.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangareader/rawotaku/res/mipmap-hdpi/ic_launcher.png b/src/ja/rawotaku/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/rawotaku/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/rawotaku/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/rawotaku/res/mipmap-mdpi/ic_launcher.png b/src/ja/rawotaku/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/rawotaku/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/rawotaku/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/rawotaku/res/mipmap-xhdpi/ic_launcher.png b/src/ja/rawotaku/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/rawotaku/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/rawotaku/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/rawotaku/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/rawotaku/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/rawotaku/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/rawotaku/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/rawotaku/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/rawotaku/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangareader/rawotaku/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/rawotaku/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangareader/rawotaku/src/RawOtaku.kt b/src/ja/rawotaku/src/eu/kanade/tachiyomi/extension/ja/rawotaku/RawOtaku.kt
similarity index 100%
rename from multisrc/overrides/mangareader/rawotaku/src/RawOtaku.kt
rename to src/ja/rawotaku/src/eu/kanade/tachiyomi/extension/ja/rawotaku/RawOtaku.kt
diff --git a/multisrc/overrides/mangareader/rawotaku/src/RawOtakuFilters.kt b/src/ja/rawotaku/src/eu/kanade/tachiyomi/extension/ja/rawotaku/RawOtakuFilters.kt
similarity index 100%
rename from multisrc/overrides/mangareader/rawotaku/src/RawOtakuFilters.kt
rename to src/ja/rawotaku/src/eu/kanade/tachiyomi/extension/ja/rawotaku/RawOtakuFilters.kt
diff --git a/src/ja/shonenjumpplus/build.gradle b/src/ja/shonenjumpplus/build.gradle
new file mode 100644
index 000000000..778403566
--- /dev/null
+++ b/src/ja/shonenjumpplus/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Shonen Jump+'
+ extClass = '.ShonenJumpPlus'
+ themePkg = 'gigaviewer'
+ baseUrl = 'https://shonenjumpplus.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-hdpi/ic_launcher.png b/src/ja/shonenjumpplus/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/shonenjumpplus/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-mdpi/ic_launcher.png b/src/ja/shonenjumpplus/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/shonenjumpplus/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xhdpi/ic_launcher.png b/src/ja/shonenjumpplus/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/shonenjumpplus/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/shonenjumpplus/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/shonenjumpplus/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/shonenjumpplus/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/shonenjumpplus/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/shonenjumpplus/src/ShonenJumpPlus.kt b/src/ja/shonenjumpplus/src/eu/kanade/tachiyomi/extension/ja/shonenjumpplus/ShonenJumpPlus.kt
similarity index 100%
rename from multisrc/overrides/gigaviewer/shonenjumpplus/src/ShonenJumpPlus.kt
rename to src/ja/shonenjumpplus/src/eu/kanade/tachiyomi/extension/ja/shonenjumpplus/ShonenJumpPlus.kt
diff --git a/src/ja/sundaywebevery/build.gradle b/src/ja/sundaywebevery/build.gradle
new file mode 100644
index 000000000..38be56bf6
--- /dev/null
+++ b/src/ja/sundaywebevery/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sunday Web Every'
+ extClass = '.SundayWebEvery'
+ themePkg = 'gigaviewer'
+ baseUrl = 'https://www.sunday-webry.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-hdpi/ic_launcher.png b/src/ja/sundaywebevery/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/sundaywebevery/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-mdpi/ic_launcher.png b/src/ja/sundaywebevery/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/sundaywebevery/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xhdpi/ic_launcher.png b/src/ja/sundaywebevery/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/sundaywebevery/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/sundaywebevery/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/sundaywebevery/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/sundaywebevery/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/sundaywebevery/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/src/SundayWebEvery.kt b/src/ja/sundaywebevery/src/eu/kanade/tachiyomi/extension/ja/sundaywebevery/SundayWebEvery.kt
similarity index 100%
rename from multisrc/overrides/gigaviewer/sundaywebevery/src/SundayWebEvery.kt
rename to src/ja/sundaywebevery/src/eu/kanade/tachiyomi/extension/ja/sundaywebevery/SundayWebEvery.kt
diff --git a/src/ja/syosetu/build.gradle b/src/ja/syosetu/build.gradle
new file mode 100644
index 000000000..10bd964e7
--- /dev/null
+++ b/src/ja/syosetu/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'SyoSetu'
+ extClass = '.SyoSetu'
+ themePkg = 'mangaraw'
+ baseUrl = 'https://syosetu.top'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangaraw/syosetu/src/SyoSetu.kt b/src/ja/syosetu/src/eu/kanade/tachiyomi/extension/ja/syosetu/SyoSetu.kt
similarity index 100%
rename from multisrc/overrides/mangaraw/syosetu/src/SyoSetu.kt
rename to src/ja/syosetu/src/eu/kanade/tachiyomi/extension/ja/syosetu/SyoSetu.kt
diff --git a/src/ja/tonarinoyoungjump/build.gradle b/src/ja/tonarinoyoungjump/build.gradle
new file mode 100644
index 000000000..33a791ab8
--- /dev/null
+++ b/src/ja/tonarinoyoungjump/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Tonari no Young Jump'
+ extClass = '.TonariNoYoungJump'
+ themePkg = 'gigaviewer'
+ baseUrl = 'https://tonarinoyj.jp'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-hdpi/ic_launcher.png b/src/ja/tonarinoyoungjump/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/tonarinoyoungjump/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-mdpi/ic_launcher.png b/src/ja/tonarinoyoungjump/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/tonarinoyoungjump/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xhdpi/ic_launcher.png b/src/ja/tonarinoyoungjump/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/tonarinoyoungjump/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/tonarinoyoungjump/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/tonarinoyoungjump/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/tonarinoyoungjump/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/tonarinoyoungjump/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/src/TonariNoYoungJump.kt b/src/ja/tonarinoyoungjump/src/eu/kanade/tachiyomi/extension/ja/tonarinoyoungjump/TonariNoYoungJump.kt
similarity index 100%
rename from multisrc/overrides/gigaviewer/tonarinoyoungjump/src/TonariNoYoungJump.kt
rename to src/ja/tonarinoyoungjump/src/eu/kanade/tachiyomi/extension/ja/tonarinoyoungjump/TonariNoYoungJump.kt
diff --git a/src/ja/webcomicgamma/build.gradle b/src/ja/webcomicgamma/build.gradle
new file mode 100644
index 000000000..b2d5bbfad
--- /dev/null
+++ b/src/ja/webcomicgamma/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Web Comic Gamma'
+ extClass = '.WebComicGamma'
+ themePkg = 'comicgamma'
+ baseUrl = 'https://webcomicgamma.takeshobo.co.jp'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/comicgamma/webcomicgamma/res/mipmap-hdpi/ic_launcher.png b/src/ja/webcomicgamma/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/comicgamma/webcomicgamma/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/webcomicgamma/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/comicgamma/webcomicgamma/res/mipmap-mdpi/ic_launcher.png b/src/ja/webcomicgamma/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/comicgamma/webcomicgamma/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/webcomicgamma/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/comicgamma/webcomicgamma/res/mipmap-xhdpi/ic_launcher.png b/src/ja/webcomicgamma/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/comicgamma/webcomicgamma/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/webcomicgamma/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/comicgamma/webcomicgamma/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/webcomicgamma/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/comicgamma/webcomicgamma/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/webcomicgamma/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/comicgamma/webcomicgamma/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/webcomicgamma/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/comicgamma/webcomicgamma/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/webcomicgamma/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/ja/webcomicgamma/src/eu/kanade/tachiyomi/extension/ja/webcomicgamma/WebComicGamma.kt b/src/ja/webcomicgamma/src/eu/kanade/tachiyomi/extension/ja/webcomicgamma/WebComicGamma.kt
new file mode 100644
index 000000000..7eddfa3a2
--- /dev/null
+++ b/src/ja/webcomicgamma/src/eu/kanade/tachiyomi/extension/ja/webcomicgamma/WebComicGamma.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.ja.webcomicgamma
+
+import eu.kanade.tachiyomi.multisrc.comicgamma.ComicGamma
+
+class WebComicGamma : ComicGamma("Web Comic Gamma", "https://webcomicgamma.takeshobo.co.jp", "ja")
diff --git a/src/ja/webcomicgammaplus/build.gradle b/src/ja/webcomicgammaplus/build.gradle
new file mode 100644
index 000000000..83fc11606
--- /dev/null
+++ b/src/ja/webcomicgammaplus/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Web Comic Gamma Plus'
+ extClass = '.WebComicGammaPlus'
+ themePkg = 'comicgamma'
+ baseUrl = 'https://gammaplus.takeshobo.co.jp'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/comicgamma/webcomicgammaplus/res/mipmap-hdpi/ic_launcher.png b/src/ja/webcomicgammaplus/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/comicgamma/webcomicgammaplus/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/webcomicgammaplus/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/comicgamma/webcomicgammaplus/res/mipmap-mdpi/ic_launcher.png b/src/ja/webcomicgammaplus/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/comicgamma/webcomicgammaplus/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/webcomicgammaplus/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/comicgamma/webcomicgammaplus/res/mipmap-xhdpi/ic_launcher.png b/src/ja/webcomicgammaplus/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/comicgamma/webcomicgammaplus/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/webcomicgammaplus/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/comicgamma/webcomicgammaplus/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/webcomicgammaplus/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/comicgamma/webcomicgammaplus/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/webcomicgammaplus/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/comicgamma/webcomicgammaplus/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/webcomicgammaplus/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/comicgamma/webcomicgammaplus/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/webcomicgammaplus/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/ja/webcomicgammaplus/src/eu/kanade/tachiyomi/extension/ja/webcomicgammaplus/WebComicGammaPlus.kt b/src/ja/webcomicgammaplus/src/eu/kanade/tachiyomi/extension/ja/webcomicgammaplus/WebComicGammaPlus.kt
new file mode 100644
index 000000000..6a0f78aa2
--- /dev/null
+++ b/src/ja/webcomicgammaplus/src/eu/kanade/tachiyomi/extension/ja/webcomicgammaplus/WebComicGammaPlus.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.ja.webcomicgammaplus
+
+import eu.kanade.tachiyomi.multisrc.comicgamma.ComicGamma
+
+class WebComicGammaPlus : ComicGamma("Web Comic Gamma Plus", "https://gammaplus.takeshobo.co.jp", "ja")
diff --git a/src/ja/welovemangaone/build.gradle b/src/ja/welovemangaone/build.gradle
new file mode 100644
index 000000000..56d956a19
--- /dev/null
+++ b/src/ja/welovemangaone/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'WeLoveMangaOne'
+ extClass = '.WeLoveMangaOne'
+ themePkg = 'fmreader'
+ baseUrl = 'https://welovemanga.one'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/fmreader/welovemangaone/src/WeLoveMangaOne.kt b/src/ja/welovemangaone/src/eu/kanade/tachiyomi/extension/ja/welovemangaone/WeLoveMangaOne.kt
similarity index 100%
rename from multisrc/overrides/fmreader/welovemangaone/src/WeLoveMangaOne.kt
rename to src/ja/welovemangaone/src/eu/kanade/tachiyomi/extension/ja/welovemangaone/WeLoveMangaOne.kt
diff --git a/src/ko/manhwaraw/build.gradle b/src/ko/manhwaraw/build.gradle
new file mode 100644
index 000000000..3e6f18686
--- /dev/null
+++ b/src/ko/manhwaraw/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manhwa Raw'
+ extClass = '.ManhwaRaw'
+ themePkg = 'madara'
+ baseUrl = 'https://manhwaraw.com'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhwaraw/res/mipmap-hdpi/ic_launcher.png b/src/ko/manhwaraw/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaraw/res/mipmap-hdpi/ic_launcher.png
rename to src/ko/manhwaraw/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaraw/res/mipmap-mdpi/ic_launcher.png b/src/ko/manhwaraw/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaraw/res/mipmap-mdpi/ic_launcher.png
rename to src/ko/manhwaraw/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaraw/res/mipmap-xhdpi/ic_launcher.png b/src/ko/manhwaraw/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaraw/res/mipmap-xhdpi/ic_launcher.png
rename to src/ko/manhwaraw/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaraw/res/mipmap-xxhdpi/ic_launcher.png b/src/ko/manhwaraw/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaraw/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ko/manhwaraw/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaraw/res/mipmap-xxxhdpi/ic_launcher.png b/src/ko/manhwaraw/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manhwaraw/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ko/manhwaraw/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manhwaraw/src/ManhwaRaw.kt b/src/ko/manhwaraw/src/eu/kanade/tachiyomi/extension/ko/manhwaraw/ManhwaRaw.kt
similarity index 100%
rename from multisrc/overrides/madara/manhwaraw/src/ManhwaRaw.kt
rename to src/ko/manhwaraw/src/eu/kanade/tachiyomi/extension/ko/manhwaraw/ManhwaRaw.kt
diff --git a/src/ko/manytoonclub/build.gradle b/src/ko/manytoonclub/build.gradle
new file mode 100644
index 000000000..2f7d0beec
--- /dev/null
+++ b/src/ko/manytoonclub/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'ManyToonClub'
+ extClass = '.ManyToonClub'
+ themePkg = 'madara'
+ baseUrl = 'https://manytoon.club'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manytoonclub/res/mipmap-hdpi/ic_launcher.png b/src/ko/manytoonclub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoonclub/res/mipmap-hdpi/ic_launcher.png
rename to src/ko/manytoonclub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoonclub/res/mipmap-mdpi/ic_launcher.png b/src/ko/manytoonclub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoonclub/res/mipmap-mdpi/ic_launcher.png
rename to src/ko/manytoonclub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoonclub/res/mipmap-xhdpi/ic_launcher.png b/src/ko/manytoonclub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoonclub/res/mipmap-xhdpi/ic_launcher.png
rename to src/ko/manytoonclub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoonclub/res/mipmap-xxhdpi/ic_launcher.png b/src/ko/manytoonclub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoonclub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ko/manytoonclub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoonclub/res/mipmap-xxxhdpi/ic_launcher.png b/src/ko/manytoonclub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/manytoonclub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ko/manytoonclub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/manytoonclub/src/ManyToonClub.kt b/src/ko/manytoonclub/src/eu/kanade/tachiyomi/extension/ko/manytoonclub/ManyToonClub.kt
similarity index 100%
rename from multisrc/overrides/madara/manytoonclub/src/ManyToonClub.kt
rename to src/ko/manytoonclub/src/eu/kanade/tachiyomi/extension/ko/manytoonclub/ManyToonClub.kt
diff --git a/src/ko/rawdex/build.gradle b/src/ko/rawdex/build.gradle
new file mode 100644
index 000000000..720bbab42
--- /dev/null
+++ b/src/ko/rawdex/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'RawDEX'
+ extClass = '.RawDEX'
+ themePkg = 'madara'
+ baseUrl = 'https://rawdex.net'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/rawdex/res/mipmap-hdpi/ic_launcher.png b/src/ko/rawdex/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rawdex/res/mipmap-hdpi/ic_launcher.png
rename to src/ko/rawdex/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rawdex/res/mipmap-mdpi/ic_launcher.png b/src/ko/rawdex/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rawdex/res/mipmap-mdpi/ic_launcher.png
rename to src/ko/rawdex/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rawdex/res/mipmap-xhdpi/ic_launcher.png b/src/ko/rawdex/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rawdex/res/mipmap-xhdpi/ic_launcher.png
rename to src/ko/rawdex/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rawdex/res/mipmap-xxhdpi/ic_launcher.png b/src/ko/rawdex/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rawdex/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ko/rawdex/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rawdex/res/mipmap-xxxhdpi/ic_launcher.png b/src/ko/rawdex/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rawdex/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ko/rawdex/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/ko/rawdex/src/eu/kanade/tachiyomi/extension/ko/rawdex/RawDEX.kt b/src/ko/rawdex/src/eu/kanade/tachiyomi/extension/ko/rawdex/RawDEX.kt
new file mode 100644
index 000000000..f85cc8f46
--- /dev/null
+++ b/src/ko/rawdex/src/eu/kanade/tachiyomi/extension/ko/rawdex/RawDEX.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.ko.rawdex
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class RawDEX : Madara("RawDEX", "https://rawdex.net", "ko")
diff --git a/src/pt/akimanga/build.gradle b/src/pt/akimanga/build.gradle
new file mode 100644
index 000000000..4c3fd1caf
--- /dev/null
+++ b/src/pt/akimanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Akimangá'
+ extClass = '.Akimanga'
+ themePkg = 'madara'
+ baseUrl = 'https://akimanga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/akimanga/src/Akimanga.kt b/src/pt/akimanga/src/eu/kanade/tachiyomi/extension/pt/akimanga/Akimanga.kt
similarity index 100%
rename from multisrc/overrides/madara/akimanga/src/Akimanga.kt
rename to src/pt/akimanga/src/eu/kanade/tachiyomi/extension/pt/akimanga/Akimanga.kt
diff --git a/src/pt/amuy/build.gradle b/src/pt/amuy/build.gradle
new file mode 100644
index 000000000..86d082c1e
--- /dev/null
+++ b/src/pt/amuy/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Amuy'
+ extClass = '.Amuy'
+ themePkg = 'madara'
+ baseUrl = 'https://apenasmaisumyaoi.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/amuy/src/Amuy.kt b/src/pt/amuy/src/eu/kanade/tachiyomi/extension/pt/amuy/Amuy.kt
similarity index 100%
rename from multisrc/overrides/madara/amuy/src/Amuy.kt
rename to src/pt/amuy/src/eu/kanade/tachiyomi/extension/pt/amuy/Amuy.kt
diff --git a/src/pt/animexnovel/build.gradle b/src/pt/animexnovel/build.gradle
new file mode 100644
index 000000000..80468f29a
--- /dev/null
+++ b/src/pt/animexnovel/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'AnimeXNovel'
+ extClass = '.AnimeXNovel'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://www.animexnovel.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/animexnovel/res/mipmap-hdpi/ic_launcher.png b/src/pt/animexnovel/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/animexnovel/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/animexnovel/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/animexnovel/res/mipmap-mdpi/ic_launcher.png b/src/pt/animexnovel/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/animexnovel/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/animexnovel/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/animexnovel/res/mipmap-xhdpi/ic_launcher.png b/src/pt/animexnovel/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/animexnovel/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/animexnovel/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/animexnovel/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/animexnovel/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/animexnovel/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/animexnovel/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/animexnovel/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/animexnovel/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/animexnovel/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/animexnovel/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/animexnovel/src/AnimeXNovel.kt b/src/pt/animexnovel/src/eu/kanade/tachiyomi/extension/pt/animexnovel/AnimeXNovel.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/animexnovel/src/AnimeXNovel.kt
rename to src/pt/animexnovel/src/eu/kanade/tachiyomi/extension/pt/animexnovel/AnimeXNovel.kt
diff --git a/src/pt/arthurscan/build.gradle b/src/pt/arthurscan/build.gradle
new file mode 100644
index 000000000..1cd3e7795
--- /dev/null
+++ b/src/pt/arthurscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Arthur Scan'
+ extClass = '.ArthurScan'
+ themePkg = 'madara'
+ baseUrl = 'https://arthurscan.xyz'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/arthurscan/res/mipmap-hdpi/ic_launcher.png b/src/pt/arthurscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arthurscan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/arthurscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arthurscan/res/mipmap-mdpi/ic_launcher.png b/src/pt/arthurscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arthurscan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/arthurscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arthurscan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/arthurscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arthurscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/arthurscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arthurscan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/arthurscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arthurscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/arthurscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arthurscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/arthurscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/arthurscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/arthurscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/arthurscan/src/ArthurScan.kt b/src/pt/arthurscan/src/eu/kanade/tachiyomi/extension/pt/arthurscan/ArthurScan.kt
similarity index 100%
rename from multisrc/overrides/madara/arthurscan/src/ArthurScan.kt
rename to src/pt/arthurscan/src/eu/kanade/tachiyomi/extension/pt/arthurscan/ArthurScan.kt
diff --git a/src/pt/astrumscans/build.gradle b/src/pt/astrumscans/build.gradle
new file mode 100644
index 000000000..b39b03533
--- /dev/null
+++ b/src/pt/astrumscans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Astrum Scans'
+ extClass = '.AstrumScans'
+ themePkg = 'madara'
+ baseUrl = 'https://astrumscans.xyz'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/astrumscans/src/AstrumScans.kt b/src/pt/astrumscans/src/eu/kanade/tachiyomi/extension/pt/astrumscans/AstrumScans.kt
similarity index 100%
rename from multisrc/overrides/madara/astrumscans/src/AstrumScans.kt
rename to src/pt/astrumscans/src/eu/kanade/tachiyomi/extension/pt/astrumscans/AstrumScans.kt
diff --git a/src/pt/aurorascan/build.gradle b/src/pt/aurorascan/build.gradle
new file mode 100644
index 000000000..237ac29c3
--- /dev/null
+++ b/src/pt/aurorascan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Aurora Scan'
+ extClass = '.AuroraScan'
+ themePkg = 'peachscan'
+ baseUrl = 'https://aurorascan.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/peachscan/aurorascan/res/mipmap-hdpi/ic_launcher.png b/src/pt/aurorascan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/aurorascan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/aurorascan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/aurorascan/res/mipmap-mdpi/ic_launcher.png b/src/pt/aurorascan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/aurorascan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/aurorascan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/aurorascan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/aurorascan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/aurorascan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/aurorascan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/aurorascan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/aurorascan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/aurorascan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/aurorascan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/aurorascan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/aurorascan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/aurorascan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/aurorascan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/pt/aurorascan/src/eu/kanade/tachiyomi/extension/pt/aurorascan/AuroraScan.kt b/src/pt/aurorascan/src/eu/kanade/tachiyomi/extension/pt/aurorascan/AuroraScan.kt
new file mode 100644
index 000000000..8caf750cc
--- /dev/null
+++ b/src/pt/aurorascan/src/eu/kanade/tachiyomi/extension/pt/aurorascan/AuroraScan.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.pt.aurorascan
+
+import eu.kanade.tachiyomi.multisrc.peachscan.PeachScan
+
+class AuroraScan : PeachScan("Aurora Scan", "https://aurorascan.net", "pt-BR")
diff --git a/src/pt/borutoexplorer/build.gradle b/src/pt/borutoexplorer/build.gradle
new file mode 100644
index 000000000..5365b965a
--- /dev/null
+++ b/src/pt/borutoexplorer/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Boruto Explorer'
+ extClass = '.BorutoExplorer'
+ themePkg = 'madara'
+ baseUrl = 'https://leitor.borutoexplorer.com.br'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/borutoexplorer/res/mipmap-hdpi/ic_launcher.png b/src/pt/borutoexplorer/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/borutoexplorer/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/borutoexplorer/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/borutoexplorer/res/mipmap-mdpi/ic_launcher.png b/src/pt/borutoexplorer/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/borutoexplorer/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/borutoexplorer/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/borutoexplorer/res/mipmap-xhdpi/ic_launcher.png b/src/pt/borutoexplorer/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/borutoexplorer/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/borutoexplorer/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/borutoexplorer/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/borutoexplorer/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/borutoexplorer/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/borutoexplorer/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/borutoexplorer/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/borutoexplorer/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/borutoexplorer/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/borutoexplorer/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/borutoexplorer/src/BorutoExplorer.kt b/src/pt/borutoexplorer/src/eu/kanade/tachiyomi/extension/pt/borutoexplorer/BorutoExplorer.kt
similarity index 100%
rename from multisrc/overrides/madara/borutoexplorer/src/BorutoExplorer.kt
rename to src/pt/borutoexplorer/src/eu/kanade/tachiyomi/extension/pt/borutoexplorer/BorutoExplorer.kt
diff --git a/src/pt/burningscans/build.gradle b/src/pt/burningscans/build.gradle
new file mode 100644
index 000000000..a040ea5c8
--- /dev/null
+++ b/src/pt/burningscans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Burning Scans'
+ extClass = '.BurningScans'
+ themePkg = 'madara'
+ baseUrl = 'https://burningscans.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/burningscans/res/mipmap-hdpi/ic_launcher.png b/src/pt/burningscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/burningscans/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/burningscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/burningscans/res/mipmap-mdpi/ic_launcher.png b/src/pt/burningscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/burningscans/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/burningscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/burningscans/res/mipmap-xhdpi/ic_launcher.png b/src/pt/burningscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/burningscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/burningscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/burningscans/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/burningscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/burningscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/burningscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/burningscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/burningscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/burningscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/burningscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/burningscans/src/BurningScans.kt b/src/pt/burningscans/src/eu/kanade/tachiyomi/extension/pt/burningscans/BurningScans.kt
similarity index 100%
rename from multisrc/overrides/madara/burningscans/src/BurningScans.kt
rename to src/pt/burningscans/src/eu/kanade/tachiyomi/extension/pt/burningscans/BurningScans.kt
diff --git a/src/pt/cafecomyaoi/build.gradle b/src/pt/cafecomyaoi/build.gradle
new file mode 100644
index 000000000..29597a95b
--- /dev/null
+++ b/src/pt/cafecomyaoi/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Café com Yaoi'
+ extClass = '.CafeComYaoi'
+ themePkg = 'madara'
+ baseUrl = 'http://cafecomyaoi.com.br'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/cafecomyaoi/src/CafeComYaoi.kt b/src/pt/cafecomyaoi/src/eu/kanade/tachiyomi/extension/pt/cafecomyaoi/CafeComYaoi.kt
similarity index 100%
rename from multisrc/overrides/madara/cafecomyaoi/src/CafeComYaoi.kt
rename to src/pt/cafecomyaoi/src/eu/kanade/tachiyomi/extension/pt/cafecomyaoi/CafeComYaoi.kt
diff --git a/src/pt/cerisescans/build.gradle b/src/pt/cerisescans/build.gradle
new file mode 100644
index 000000000..e3a7b948c
--- /dev/null
+++ b/src/pt/cerisescans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Cerise Scan'
+ extClass = '.CeriseScan'
+ themePkg = 'madara'
+ baseUrl = 'https://cerisescan.net'
+ overrideVersionCode = 8
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/cerisescans/res/mipmap-hdpi/ic_launcher.png b/src/pt/cerisescans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cerisescans/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/cerisescans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cerisescans/res/mipmap-mdpi/ic_launcher.png b/src/pt/cerisescans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cerisescans/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/cerisescans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cerisescans/res/mipmap-xhdpi/ic_launcher.png b/src/pt/cerisescans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cerisescans/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/cerisescans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cerisescans/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/cerisescans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cerisescans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/cerisescans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cerisescans/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/cerisescans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cerisescans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/cerisescans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cerisescans/src/CeriseScan.kt b/src/pt/cerisescans/src/eu/kanade/tachiyomi/extension/pt/cerisescans/CeriseScan.kt
similarity index 100%
rename from multisrc/overrides/madara/cerisescans/src/CeriseScan.kt
rename to src/pt/cerisescans/src/eu/kanade/tachiyomi/extension/pt/cerisescans/CeriseScan.kt
diff --git a/src/pt/dangoscan/build.gradle b/src/pt/dangoscan/build.gradle
new file mode 100644
index 000000000..11ddddbf3
--- /dev/null
+++ b/src/pt/dangoscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Dango Scan'
+ extClass = '.DangoScan'
+ themePkg = 'peachscan'
+ baseUrl = 'https://dangoscan.com.br'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/peachscan/dangoscan/res/mipmap-hdpi/ic_launcher.png b/src/pt/dangoscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/dangoscan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/dangoscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/dangoscan/res/mipmap-mdpi/ic_launcher.png b/src/pt/dangoscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/dangoscan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/dangoscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/dangoscan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/dangoscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/dangoscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/dangoscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/dangoscan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/dangoscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/dangoscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/dangoscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/dangoscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/dangoscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/dangoscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/dangoscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/pt/dangoscan/src/eu/kanade/tachiyomi/extension/pt/dangoscan/DangoScan.kt b/src/pt/dangoscan/src/eu/kanade/tachiyomi/extension/pt/dangoscan/DangoScan.kt
new file mode 100644
index 000000000..f0da076bc
--- /dev/null
+++ b/src/pt/dangoscan/src/eu/kanade/tachiyomi/extension/pt/dangoscan/DangoScan.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.pt.dangoscan
+
+import eu.kanade.tachiyomi.multisrc.peachscan.PeachScan
+
+class DangoScan : PeachScan("Dango Scan", "https://dangoscan.com.br", "pt-BR")
diff --git a/src/pt/dessertscan/build.gradle b/src/pt/dessertscan/build.gradle
new file mode 100644
index 000000000..814bb6048
--- /dev/null
+++ b/src/pt/dessertscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Dessert Scan'
+ extClass = '.DessertScan'
+ themePkg = 'madara'
+ baseUrl = 'https://cabaredowatame.site'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/dessertscan/src/DessertScan.kt b/src/pt/dessertscan/src/eu/kanade/tachiyomi/extension/pt/dessertscan/DessertScan.kt
similarity index 100%
rename from multisrc/overrides/madara/dessertscan/src/DessertScan.kt
rename to src/pt/dessertscan/src/eu/kanade/tachiyomi/extension/pt/dessertscan/DessertScan.kt
diff --git a/src/pt/diskusscan/build.gradle b/src/pt/diskusscan/build.gradle
new file mode 100644
index 000000000..86cba29ce
--- /dev/null
+++ b/src/pt/diskusscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Diskus Scan'
+ extClass = '.DiskusScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://diskusscan.com'
+ overrideVersionCode = 9
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/diskusscan/res/mipmap-hdpi/ic_launcher.png b/src/pt/diskusscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/diskusscan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/diskusscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/diskusscan/res/mipmap-mdpi/ic_launcher.png b/src/pt/diskusscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/diskusscan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/diskusscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/diskusscan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/diskusscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/diskusscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/diskusscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/diskusscan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/diskusscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/diskusscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/diskusscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/diskusscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/diskusscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/diskusscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/diskusscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/diskusscan/src/DiskusScan.kt b/src/pt/diskusscan/src/eu/kanade/tachiyomi/extension/pt/diskusscan/DiskusScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/diskusscan/src/DiskusScan.kt
rename to src/pt/diskusscan/src/eu/kanade/tachiyomi/extension/pt/diskusscan/DiskusScan.kt
diff --git a/src/pt/dropescan/build.gradle b/src/pt/dropescan/build.gradle
new file mode 100644
index 000000000..932763e24
--- /dev/null
+++ b/src/pt/dropescan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Drope Scan'
+ extClass = '.DropeScan'
+ themePkg = 'madara'
+ baseUrl = 'https://dropescan.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/dropescan/res/mipmap-hdpi/ic_launcher.png b/src/pt/dropescan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dropescan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/dropescan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dropescan/res/mipmap-mdpi/ic_launcher.png b/src/pt/dropescan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dropescan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/dropescan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dropescan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/dropescan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dropescan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/dropescan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dropescan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/dropescan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dropescan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/dropescan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dropescan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/dropescan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/dropescan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/dropescan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/dropescan/src/DropeScan.kt b/src/pt/dropescan/src/eu/kanade/tachiyomi/extension/pt/dropescan/DropeScan.kt
similarity index 100%
rename from multisrc/overrides/madara/dropescan/src/DropeScan.kt
rename to src/pt/dropescan/src/eu/kanade/tachiyomi/extension/pt/dropescan/DropeScan.kt
diff --git a/src/pt/elevenscanlator/build.gradle b/src/pt/elevenscanlator/build.gradle
new file mode 100644
index 000000000..8d8d6113a
--- /dev/null
+++ b/src/pt/elevenscanlator/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Eleven Scanlator'
+ extClass = '.ElevenScanlator'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://elevenscanlator.blogspot.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/elevenscanlator/res/mipmap-hdpi/ic_launcher.png b/src/pt/elevenscanlator/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/elevenscanlator/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/elevenscanlator/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/elevenscanlator/res/mipmap-mdpi/ic_launcher.png b/src/pt/elevenscanlator/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/elevenscanlator/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/elevenscanlator/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/elevenscanlator/res/mipmap-xhdpi/ic_launcher.png b/src/pt/elevenscanlator/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/elevenscanlator/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/elevenscanlator/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/elevenscanlator/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/elevenscanlator/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/elevenscanlator/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/elevenscanlator/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/elevenscanlator/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/elevenscanlator/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/elevenscanlator/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/elevenscanlator/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/pt/elevenscanlator/src/eu/kanade/tachiyomi/extension/pt/elevenscanlator/ElevenScanlator.kt b/src/pt/elevenscanlator/src/eu/kanade/tachiyomi/extension/pt/elevenscanlator/ElevenScanlator.kt
new file mode 100644
index 000000000..0be34a4f3
--- /dev/null
+++ b/src/pt/elevenscanlator/src/eu/kanade/tachiyomi/extension/pt/elevenscanlator/ElevenScanlator.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.pt.elevenscanlator
+
+import eu.kanade.tachiyomi.multisrc.zeistmanga.ZeistManga
+
+class ElevenScanlator : ZeistManga("Eleven Scanlator", "https://elevenscanlator.blogspot.com", "pt-BR")
diff --git a/src/pt/fayscans/build.gradle b/src/pt/fayscans/build.gradle
new file mode 100644
index 000000000..bde34e431
--- /dev/null
+++ b/src/pt/fayscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Fay Scans'
+ extClass = '.FayScans'
+ themePkg = 'madara'
+ baseUrl = 'https://fayscans.net'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/fayscans/res/mipmap-hdpi/ic_launcher.png b/src/pt/fayscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/fayscans/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/fayscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/fayscans/res/mipmap-mdpi/ic_launcher.png b/src/pt/fayscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/fayscans/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/fayscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/fayscans/res/mipmap-xhdpi/ic_launcher.png b/src/pt/fayscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/fayscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/fayscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/fayscans/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/fayscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/fayscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/fayscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/fayscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/fayscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/fayscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/fayscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/fayscans/src/FayScans.kt b/src/pt/fayscans/src/eu/kanade/tachiyomi/extension/pt/fayscans/FayScans.kt
similarity index 100%
rename from multisrc/overrides/madara/fayscans/src/FayScans.kt
rename to src/pt/fayscans/src/eu/kanade/tachiyomi/extension/pt/fayscans/FayScans.kt
diff --git a/src/pt/fleurblanche/build.gradle b/src/pt/fleurblanche/build.gradle
new file mode 100644
index 000000000..77d7abeb4
--- /dev/null
+++ b/src/pt/fleurblanche/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Fleur Blanche'
+ extClass = '.FleurBlanche'
+ themePkg = 'madara'
+ baseUrl = 'https://fbsquads.com'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/fleurblanche/res/mipmap-hdpi/ic_launcher.png b/src/pt/fleurblanche/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/fleurblanche/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/fleurblanche/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/fleurblanche/res/mipmap-mdpi/ic_launcher.png b/src/pt/fleurblanche/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/fleurblanche/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/fleurblanche/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/fleurblanche/res/mipmap-xhdpi/ic_launcher.png b/src/pt/fleurblanche/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/fleurblanche/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/fleurblanche/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/fleurblanche/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/fleurblanche/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/fleurblanche/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/fleurblanche/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/fleurblanche/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/fleurblanche/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/fleurblanche/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/fleurblanche/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/fleurblanche/src/FleurBlanche.kt b/src/pt/fleurblanche/src/eu/kanade/tachiyomi/extension/pt/fleurblanche/FleurBlanche.kt
similarity index 100%
rename from multisrc/overrides/madara/fleurblanche/src/FleurBlanche.kt
rename to src/pt/fleurblanche/src/eu/kanade/tachiyomi/extension/pt/fleurblanche/FleurBlanche.kt
diff --git a/src/pt/flowermanga/build.gradle b/src/pt/flowermanga/build.gradle
new file mode 100644
index 000000000..110e05e6d
--- /dev/null
+++ b/src/pt/flowermanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Flower Manga'
+ extClass = '.FlowerManga'
+ themePkg = 'madara'
+ baseUrl = 'https://flowermanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/flowermanga/src/FlowerManga.kt b/src/pt/flowermanga/src/eu/kanade/tachiyomi/extension/pt/flowermanga/FlowerManga.kt
similarity index 100%
rename from multisrc/overrides/madara/flowermanga/src/FlowerManga.kt
rename to src/pt/flowermanga/src/eu/kanade/tachiyomi/extension/pt/flowermanga/FlowerManga.kt
diff --git a/src/pt/foxwhite/build.gradle b/src/pt/foxwhite/build.gradle
new file mode 100644
index 000000000..d7a4e324b
--- /dev/null
+++ b/src/pt/foxwhite/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Fox White'
+ extClass = '.FoxWhite'
+ themePkg = 'madara'
+ baseUrl = 'https://foxwhite.com.br'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/foxwhite/res/mipmap-hdpi/ic_launcher.png b/src/pt/foxwhite/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/foxwhite/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/foxwhite/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/foxwhite/res/mipmap-mdpi/ic_launcher.png b/src/pt/foxwhite/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/foxwhite/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/foxwhite/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/foxwhite/res/mipmap-xhdpi/ic_launcher.png b/src/pt/foxwhite/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/foxwhite/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/foxwhite/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/foxwhite/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/foxwhite/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/foxwhite/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/foxwhite/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/foxwhite/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/foxwhite/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/foxwhite/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/foxwhite/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/foxwhite/src/FoxWhite.kt b/src/pt/foxwhite/src/eu/kanade/tachiyomi/extension/pt/foxwhite/FoxWhite.kt
similarity index 100%
rename from multisrc/overrides/madara/foxwhite/src/FoxWhite.kt
rename to src/pt/foxwhite/src/eu/kanade/tachiyomi/extension/pt/foxwhite/FoxWhite.kt
diff --git a/src/pt/franxxmangas/build.gradle b/src/pt/franxxmangas/build.gradle
new file mode 100644
index 000000000..d66cd8e5b
--- /dev/null
+++ b/src/pt/franxxmangas/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Franxx Mangás'
+ extClass = '.FranxxMangas'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://franxxmangas.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/franxxmangas/src/FranxxMangas.kt b/src/pt/franxxmangas/src/eu/kanade/tachiyomi/extension/pt/franxxmangas/FranxxMangas.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/franxxmangas/src/FranxxMangas.kt
rename to src/pt/franxxmangas/src/eu/kanade/tachiyomi/extension/pt/franxxmangas/FranxxMangas.kt
diff --git a/src/pt/gekkouscan/build.gradle b/src/pt/gekkouscan/build.gradle
new file mode 100644
index 000000000..bc1f1a401
--- /dev/null
+++ b/src/pt/gekkouscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Gekkou Scans'
+ extClass = '.GekkouScans'
+ themePkg = 'madara'
+ baseUrl = 'https://gekkou.site'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/gekkouscan/res/mipmap-hdpi/ic_launcher.png b/src/pt/gekkouscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gekkouscan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/gekkouscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gekkouscan/res/mipmap-mdpi/ic_launcher.png b/src/pt/gekkouscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gekkouscan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/gekkouscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gekkouscan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/gekkouscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gekkouscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/gekkouscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gekkouscan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/gekkouscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gekkouscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/gekkouscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gekkouscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/gekkouscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gekkouscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/gekkouscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gekkouscan/src/GekkouScans.kt b/src/pt/gekkouscan/src/eu/kanade/tachiyomi/extension/pt/gekkouscan/GekkouScans.kt
similarity index 100%
rename from multisrc/overrides/madara/gekkouscan/src/GekkouScans.kt
rename to src/pt/gekkouscan/src/eu/kanade/tachiyomi/extension/pt/gekkouscan/GekkouScans.kt
diff --git a/src/pt/ghostscan/build.gradle b/src/pt/ghostscan/build.gradle
new file mode 100644
index 000000000..95c94c42c
--- /dev/null
+++ b/src/pt/ghostscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Ghost Scan'
+ extClass = '.GhostScan'
+ themePkg = 'madara'
+ baseUrl = 'https://ghostscan.com.br'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/ghostscan/src/GhostScan.kt b/src/pt/ghostscan/src/eu/kanade/tachiyomi/extension/pt/ghostscan/GhostScan.kt
similarity index 100%
rename from multisrc/overrides/madara/ghostscan/src/GhostScan.kt
rename to src/pt/ghostscan/src/eu/kanade/tachiyomi/extension/pt/ghostscan/GhostScan.kt
diff --git a/src/pt/gooffansub/build.gradle b/src/pt/gooffansub/build.gradle
new file mode 100644
index 000000000..9c517a2a5
--- /dev/null
+++ b/src/pt/gooffansub/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Goof Fansub'
+ extClass = '.GoofFansub'
+ themePkg = 'madara'
+ baseUrl = 'https://gooffansub.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/gooffansub/res/mipmap-hdpi/ic_launcher.png b/src/pt/gooffansub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gooffansub/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/gooffansub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gooffansub/res/mipmap-mdpi/ic_launcher.png b/src/pt/gooffansub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gooffansub/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/gooffansub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gooffansub/res/mipmap-xhdpi/ic_launcher.png b/src/pt/gooffansub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gooffansub/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/gooffansub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gooffansub/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/gooffansub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gooffansub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/gooffansub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gooffansub/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/gooffansub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/gooffansub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/gooffansub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/gooffansub/src/GoofFansub.kt b/src/pt/gooffansub/src/eu/kanade/tachiyomi/extension/pt/gooffansub/GoofFansub.kt
similarity index 100%
rename from multisrc/overrides/madara/gooffansub/src/GoofFansub.kt
rename to src/pt/gooffansub/src/eu/kanade/tachiyomi/extension/pt/gooffansub/GoofFansub.kt
diff --git a/src/pt/guildatierdraw/build.gradle b/src/pt/guildatierdraw/build.gradle
new file mode 100644
index 000000000..aa2f58c7d
--- /dev/null
+++ b/src/pt/guildatierdraw/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Guilda Tier Draw'
+ extClass = '.GuildaTierDraw'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://www.guildatierdraw.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/guildatierdraw/res/mipmap-hdpi/ic_launcher.png b/src/pt/guildatierdraw/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/guildatierdraw/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/guildatierdraw/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/guildatierdraw/res/mipmap-mdpi/ic_launcher.png b/src/pt/guildatierdraw/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/guildatierdraw/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/guildatierdraw/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/guildatierdraw/res/mipmap-xhdpi/ic_launcher.png b/src/pt/guildatierdraw/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/guildatierdraw/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/guildatierdraw/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/guildatierdraw/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/guildatierdraw/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/guildatierdraw/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/guildatierdraw/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/guildatierdraw/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/guildatierdraw/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/guildatierdraw/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/guildatierdraw/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/guildatierdraw/src/GuildaTierDraw.kt b/src/pt/guildatierdraw/src/eu/kanade/tachiyomi/extension/pt/guildatierdraw/GuildaTierDraw.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/guildatierdraw/src/GuildaTierDraw.kt
rename to src/pt/guildatierdraw/src/eu/kanade/tachiyomi/extension/pt/guildatierdraw/GuildaTierDraw.kt
diff --git a/src/pt/hentaiseason/build.gradle b/src/pt/hentaiseason/build.gradle
new file mode 100644
index 000000000..e72dc54b0
--- /dev/null
+++ b/src/pt/hentaiseason/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hentai Season'
+ extClass = '.HentaiSeason'
+ themePkg = 'gattsu'
+ baseUrl = 'https://hentaiseason.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gattsu/hentaiseason/res/mipmap-hdpi/ic_launcher.png b/src/pt/hentaiseason/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/hentaiseason/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/hentaiseason/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/hentaiseason/res/mipmap-mdpi/ic_launcher.png b/src/pt/hentaiseason/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/hentaiseason/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/hentaiseason/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/hentaiseason/res/mipmap-xhdpi/ic_launcher.png b/src/pt/hentaiseason/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/hentaiseason/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/hentaiseason/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/hentaiseason/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/hentaiseason/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/hentaiseason/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/hentaiseason/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/hentaiseason/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/hentaiseason/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/hentaiseason/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/hentaiseason/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/hentaiseason/src/HentaiSeason.kt b/src/pt/hentaiseason/src/eu/kanade/tachiyomi/extension/pt/hentaiseason/HentaiSeason.kt
similarity index 100%
rename from multisrc/overrides/gattsu/hentaiseason/src/HentaiSeason.kt
rename to src/pt/hentaiseason/src/eu/kanade/tachiyomi/extension/pt/hentaiseason/HentaiSeason.kt
diff --git a/src/pt/hentaiteca/build.gradle b/src/pt/hentaiteca/build.gradle
new file mode 100644
index 000000000..5de7c173a
--- /dev/null
+++ b/src/pt/hentaiteca/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hentai Teca'
+ extClass = '.HentaiTeca'
+ themePkg = 'madara'
+ baseUrl = 'https://hentaiteca.net'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentaiteca/src/HentaiTeca.kt b/src/pt/hentaiteca/src/eu/kanade/tachiyomi/extension/pt/hentaiteca/HentaiTeca.kt
similarity index 100%
rename from multisrc/overrides/madara/hentaiteca/src/HentaiTeca.kt
rename to src/pt/hentaiteca/src/eu/kanade/tachiyomi/extension/pt/hentaiteca/HentaiTeca.kt
diff --git a/src/pt/hentaitokyo/build.gradle b/src/pt/hentaitokyo/build.gradle
new file mode 100644
index 000000000..ef303995d
--- /dev/null
+++ b/src/pt/hentaitokyo/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hentai Tokyo'
+ extClass = '.HentaiTokyo'
+ themePkg = 'gattsu'
+ baseUrl = 'https://hentaitokyo.net'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gattsu/hentaitokyo/src/HentaiTokyo.kt b/src/pt/hentaitokyo/src/eu/kanade/tachiyomi/extension/pt/hentaitokyo/HentaiTokyo.kt
similarity index 100%
rename from multisrc/overrides/gattsu/hentaitokyo/src/HentaiTokyo.kt
rename to src/pt/hentaitokyo/src/eu/kanade/tachiyomi/extension/pt/hentaitokyo/HentaiTokyo.kt
diff --git a/src/pt/hikariscan/build.gradle b/src/pt/hikariscan/build.gradle
new file mode 100644
index 000000000..a8786a87f
--- /dev/null
+++ b/src/pt/hikariscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hikari Scan'
+ extClass = '.HikariScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://hikariscan.org'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-hdpi/ic_launcher.png b/src/pt/hikariscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hikariscan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/hikariscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-mdpi/ic_launcher.png b/src/pt/hikariscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hikariscan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/hikariscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/hikariscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/hikariscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/hikariscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/hikariscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/hikariscan/src/HikariScan.kt b/src/pt/hikariscan/src/eu/kanade/tachiyomi/extension/pt/hikariscan/HikariScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/hikariscan/src/HikariScan.kt
rename to src/pt/hikariscan/src/eu/kanade/tachiyomi/extension/pt/hikariscan/HikariScan.kt
diff --git a/src/pt/hipercool/build.gradle b/src/pt/hipercool/build.gradle
new file mode 100644
index 000000000..99e9cd7eb
--- /dev/null
+++ b/src/pt/hipercool/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HipercooL'
+ extClass = '.Hipercool'
+ themePkg = 'madara'
+ baseUrl = 'https://hiper.cool'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hipercool/res/mipmap-hdpi/ic_launcher.png b/src/pt/hipercool/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hipercool/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/hipercool/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hipercool/res/mipmap-mdpi/ic_launcher.png b/src/pt/hipercool/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hipercool/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/hipercool/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hipercool/res/mipmap-xhdpi/ic_launcher.png b/src/pt/hipercool/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hipercool/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/hipercool/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hipercool/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/hipercool/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hipercool/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/hipercool/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hipercool/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/hipercool/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hipercool/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/hipercool/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hipercool/src/Hipercool.kt b/src/pt/hipercool/src/eu/kanade/tachiyomi/extension/pt/hipercool/Hipercool.kt
similarity index 100%
rename from multisrc/overrides/madara/hipercool/src/Hipercool.kt
rename to src/pt/hipercool/src/eu/kanade/tachiyomi/extension/pt/hipercool/Hipercool.kt
diff --git a/src/pt/huntersscans/build.gradle b/src/pt/huntersscans/build.gradle
new file mode 100644
index 000000000..6ba36d656
--- /dev/null
+++ b/src/pt/huntersscans/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hunters Scans'
+ extClass = '.HuntersScans'
+ themePkg = 'madara'
+ baseUrl = 'https://huntersscan.xyz'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/huntersscans/res/mipmap-hdpi/ic_launcher.png b/src/pt/huntersscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/huntersscans/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/huntersscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/huntersscans/res/mipmap-mdpi/ic_launcher.png b/src/pt/huntersscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/huntersscans/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/huntersscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/huntersscans/res/mipmap-xhdpi/ic_launcher.png b/src/pt/huntersscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/huntersscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/huntersscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/huntersscans/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/huntersscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/huntersscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/huntersscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/huntersscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/huntersscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/huntersscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/huntersscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/huntersscans/src/HuntersScans.kt b/src/pt/huntersscans/src/eu/kanade/tachiyomi/extension/pt/huntersscans/HuntersScans.kt
similarity index 100%
rename from multisrc/overrides/madara/huntersscans/src/HuntersScans.kt
rename to src/pt/huntersscans/src/eu/kanade/tachiyomi/extension/pt/huntersscans/HuntersScans.kt
diff --git a/src/pt/illusionscan/build.gradle b/src/pt/illusionscan/build.gradle
new file mode 100644
index 000000000..501a9fc6f
--- /dev/null
+++ b/src/pt/illusionscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Illusion Scan'
+ extClass = '.IllusionScan'
+ themePkg = 'madara'
+ baseUrl = 'https://illusionscan.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/illusionscan/res/mipmap-hdpi/ic_launcher.png b/src/pt/illusionscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/illusionscan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/illusionscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/illusionscan/res/mipmap-mdpi/ic_launcher.png b/src/pt/illusionscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/illusionscan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/illusionscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/illusionscan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/illusionscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/illusionscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/illusionscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/illusionscan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/illusionscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/illusionscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/illusionscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/illusionscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/illusionscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/illusionscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/illusionscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/illusionscan/src/IllusionScan.kt b/src/pt/illusionscan/src/eu/kanade/tachiyomi/extension/pt/illusionscan/IllusionScan.kt
similarity index 100%
rename from multisrc/overrides/madara/illusionscan/src/IllusionScan.kt
rename to src/pt/illusionscan/src/eu/kanade/tachiyomi/extension/pt/illusionscan/IllusionScan.kt
diff --git a/src/pt/imaginescan/build.gradle b/src/pt/imaginescan/build.gradle
new file mode 100644
index 000000000..57bee62f7
--- /dev/null
+++ b/src/pt/imaginescan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Imagine Scan'
+ extClass = '.ImagineScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://imaginescan.com.br'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/imaginescan/res/mipmap-hdpi/ic_launcher.png b/src/pt/imaginescan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/imaginescan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/imaginescan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/imaginescan/res/mipmap-mdpi/ic_launcher.png b/src/pt/imaginescan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/imaginescan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/imaginescan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/imaginescan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/imaginescan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/imaginescan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/imaginescan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/imaginescan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/imaginescan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/imaginescan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/imaginescan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/imaginescan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/imaginescan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/imaginescan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/imaginescan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/imaginescan/src/ImagineScan.kt b/src/pt/imaginescan/src/eu/kanade/tachiyomi/extension/pt/imaginescan/ImagineScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/imaginescan/src/ImagineScan.kt
rename to src/pt/imaginescan/src/eu/kanade/tachiyomi/extension/pt/imaginescan/ImagineScan.kt
diff --git a/src/pt/imperiodabritannia/build.gradle b/src/pt/imperiodabritannia/build.gradle
new file mode 100644
index 000000000..308d5fe9c
--- /dev/null
+++ b/src/pt/imperiodabritannia/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sagrado Império da Britannia'
+ extClass = '.ImperioDaBritannia'
+ themePkg = 'madara'
+ baseUrl = 'https://imperiodabritannia.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/imperiodabritannia/src/ImperioDaBritannia.kt b/src/pt/imperiodabritannia/src/eu/kanade/tachiyomi/extension/pt/imperiodabritannia/ImperioDaBritannia.kt
similarity index 100%
rename from multisrc/overrides/madara/imperiodabritannia/src/ImperioDaBritannia.kt
rename to src/pt/imperiodabritannia/src/eu/kanade/tachiyomi/extension/pt/imperiodabritannia/ImperioDaBritannia.kt
diff --git a/src/pt/imperioscans/build.gradle b/src/pt/imperioscans/build.gradle
new file mode 100644
index 000000000..d9e7e9fa8
--- /dev/null
+++ b/src/pt/imperioscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Neroxus'
+ extClass = '.ImperioScans'
+ themePkg = 'madara'
+ baseUrl = 'https://neroxus.com.br'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/imperioscans/res/mipmap-hdpi/ic_launcher.png b/src/pt/imperioscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/imperioscans/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/imperioscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/imperioscans/res/mipmap-mdpi/ic_launcher.png b/src/pt/imperioscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/imperioscans/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/imperioscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/imperioscans/res/mipmap-xhdpi/ic_launcher.png b/src/pt/imperioscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/imperioscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/imperioscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/imperioscans/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/imperioscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/imperioscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/imperioscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/imperioscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/imperioscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/imperioscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/imperioscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/imperioscans/src/ImperioScans.kt b/src/pt/imperioscans/src/eu/kanade/tachiyomi/extension/pt/imperioscans/ImperioScans.kt
similarity index 100%
rename from multisrc/overrides/madara/imperioscans/src/ImperioScans.kt
rename to src/pt/imperioscans/src/eu/kanade/tachiyomi/extension/pt/imperioscans/ImperioScans.kt
diff --git a/src/pt/irisscanlator/build.gradle b/src/pt/irisscanlator/build.gradle
new file mode 100644
index 000000000..5b562a499
--- /dev/null
+++ b/src/pt/irisscanlator/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Iris Scanlator'
+ extClass = '.IrisScanlator'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://irisscanlator.com.br'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/irisscanlator/res/mipmap-hdpi/ic_launcher.png b/src/pt/irisscanlator/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/irisscanlator/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/irisscanlator/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/irisscanlator/res/mipmap-mdpi/ic_launcher.png b/src/pt/irisscanlator/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/irisscanlator/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/irisscanlator/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/irisscanlator/res/mipmap-xhdpi/ic_launcher.png b/src/pt/irisscanlator/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/irisscanlator/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/irisscanlator/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/irisscanlator/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/irisscanlator/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/irisscanlator/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/irisscanlator/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/irisscanlator/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/irisscanlator/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/irisscanlator/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/irisscanlator/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/irisscanlator/src/IrisScanlator.kt b/src/pt/irisscanlator/src/eu/kanade/tachiyomi/extension/pt/irisscanlator/IrisScanlator.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/irisscanlator/src/IrisScanlator.kt
rename to src/pt/irisscanlator/src/eu/kanade/tachiyomi/extension/pt/irisscanlator/IrisScanlator.kt
diff --git a/src/pt/kakuseiproject/build.gradle b/src/pt/kakuseiproject/build.gradle
new file mode 100644
index 000000000..52cd7d4f1
--- /dev/null
+++ b/src/pt/kakuseiproject/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Kakusei Project'
+ extClass = '.KakuseiProject'
+ themePkg = 'madara'
+ baseUrl = 'https://kakuseiproject.com.br'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/kakuseiproject/src/KakuseiProject.kt b/src/pt/kakuseiproject/src/eu/kanade/tachiyomi/extension/pt/kakuseiproject/KakuseiProject.kt
similarity index 100%
rename from multisrc/overrides/madara/kakuseiproject/src/KakuseiProject.kt
rename to src/pt/kakuseiproject/src/eu/kanade/tachiyomi/extension/pt/kakuseiproject/KakuseiProject.kt
diff --git a/src/pt/kamisamaexplorer/build.gradle b/src/pt/kamisamaexplorer/build.gradle
new file mode 100644
index 000000000..689a49437
--- /dev/null
+++ b/src/pt/kamisamaexplorer/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Kami Sama Explorer'
+ extClass = '.KamiSamaExplorer'
+ themePkg = 'madara'
+ baseUrl = 'https://leitor.kamisama.com.br'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/kamisamaexplorer/res/mipmap-hdpi/ic_launcher.png b/src/pt/kamisamaexplorer/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kamisamaexplorer/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/kamisamaexplorer/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kamisamaexplorer/res/mipmap-mdpi/ic_launcher.png b/src/pt/kamisamaexplorer/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kamisamaexplorer/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/kamisamaexplorer/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kamisamaexplorer/res/mipmap-xhdpi/ic_launcher.png b/src/pt/kamisamaexplorer/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kamisamaexplorer/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/kamisamaexplorer/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kamisamaexplorer/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/kamisamaexplorer/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kamisamaexplorer/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/kamisamaexplorer/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kamisamaexplorer/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/kamisamaexplorer/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kamisamaexplorer/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/kamisamaexplorer/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kamisamaexplorer/src/KamiSamaExplorer.kt b/src/pt/kamisamaexplorer/src/eu/kanade/tachiyomi/extension/pt/kamisamaexplorer/KamiSamaExplorer.kt
similarity index 100%
rename from multisrc/overrides/madara/kamisamaexplorer/src/KamiSamaExplorer.kt
rename to src/pt/kamisamaexplorer/src/eu/kanade/tachiyomi/extension/pt/kamisamaexplorer/KamiSamaExplorer.kt
diff --git a/src/pt/ler999/build.gradle b/src/pt/ler999/build.gradle
new file mode 100644
index 000000000..937da7f10
--- /dev/null
+++ b/src/pt/ler999/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Ler 999'
+ extClass = '.Ler999'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://ler999.blogspot.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/ler999/res/mipmap-hdpi/ic_launcher.png b/src/pt/ler999/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/ler999/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/ler999/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/ler999/res/mipmap-mdpi/ic_launcher.png b/src/pt/ler999/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/ler999/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/ler999/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/ler999/res/mipmap-xhdpi/ic_launcher.png b/src/pt/ler999/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/ler999/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/ler999/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/ler999/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/ler999/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/ler999/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/ler999/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/ler999/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/ler999/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/ler999/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/ler999/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/ler999/src/Ler999.kt b/src/pt/ler999/src/eu/kanade/tachiyomi/extension/pt/ler999/Ler999.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/ler999/src/Ler999.kt
rename to src/pt/ler999/src/eu/kanade/tachiyomi/extension/pt/ler999/Ler999.kt
diff --git a/src/pt/leryaoi/build.gradle b/src/pt/leryaoi/build.gradle
new file mode 100644
index 000000000..3c95f2ce6
--- /dev/null
+++ b/src/pt/leryaoi/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Ler Yaoi'
+ extClass = '.LerYaoi'
+ themePkg = 'madara'
+ baseUrl = 'https://leryaoi.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/leryaoi/src/LerYaoi.kt b/src/pt/leryaoi/src/eu/kanade/tachiyomi/extension/pt/leryaoi/LerYaoi.kt
similarity index 100%
rename from multisrc/overrides/madara/leryaoi/src/LerYaoi.kt
rename to src/pt/leryaoi/src/eu/kanade/tachiyomi/extension/pt/leryaoi/LerYaoi.kt
diff --git a/src/pt/limboscan/build.gradle b/src/pt/limboscan/build.gradle
new file mode 100644
index 000000000..c6648bcc9
--- /dev/null
+++ b/src/pt/limboscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Limbo Scan'
+ extClass = '.LimboScan'
+ themePkg = 'madara'
+ baseUrl = 'https://limboscan.com.br'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/limboscan/src/LimboScan.kt b/src/pt/limboscan/src/eu/kanade/tachiyomi/extension/pt/limboscan/LimboScan.kt
similarity index 100%
rename from multisrc/overrides/madara/limboscan/src/LimboScan.kt
rename to src/pt/limboscan/src/eu/kanade/tachiyomi/extension/pt/limboscan/LimboScan.kt
diff --git a/src/pt/linkstartscan/build.gradle b/src/pt/linkstartscan/build.gradle
new file mode 100644
index 000000000..61c976885
--- /dev/null
+++ b/src/pt/linkstartscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Link Start Scan'
+ extClass = '.LinkStartScan'
+ themePkg = 'madara'
+ baseUrl = 'https://www.linkstartscan.xyz'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/linkstartscan/src/LinkStartScan.kt b/src/pt/linkstartscan/src/eu/kanade/tachiyomi/extension/pt/linkstartscan/LinkStartScan.kt
similarity index 100%
rename from multisrc/overrides/madara/linkstartscan/src/LinkStartScan.kt
rename to src/pt/linkstartscan/src/eu/kanade/tachiyomi/extension/pt/linkstartscan/LinkStartScan.kt
diff --git a/src/pt/maidscan/build.gradle b/src/pt/maidscan/build.gradle
new file mode 100644
index 000000000..53387759b
--- /dev/null
+++ b/src/pt/maidscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Maid Scan'
+ extClass = '.MaidScan'
+ themePkg = 'madara'
+ baseUrl = 'https://maidscan.com.br'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/maidscan/src/MaidScan.kt b/src/pt/maidscan/src/eu/kanade/tachiyomi/extension/pt/maidscan/MaidScan.kt
similarity index 100%
rename from multisrc/overrides/madara/maidscan/src/MaidScan.kt
rename to src/pt/maidscan/src/eu/kanade/tachiyomi/extension/pt/maidscan/MaidScan.kt
diff --git a/src/pt/mangananquim/build.gradle b/src/pt/mangananquim/build.gradle
new file mode 100644
index 000000000..ec01ab4b4
--- /dev/null
+++ b/src/pt/mangananquim/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangá Nanquim'
+ extClass = '.MangaNanquim'
+ themePkg = 'madara'
+ baseUrl = 'https://mangananquim.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangananquim/src/MangaNanquim.kt b/src/pt/mangananquim/src/eu/kanade/tachiyomi/extension/pt/mangananquim/MangaNanquim.kt
similarity index 100%
rename from multisrc/overrides/madara/mangananquim/src/MangaNanquim.kt
rename to src/pt/mangananquim/src/eu/kanade/tachiyomi/extension/pt/mangananquim/MangaNanquim.kt
diff --git a/src/pt/mangaschan/build.gradle b/src/pt/mangaschan/build.gradle
new file mode 100644
index 000000000..7ad6967bd
--- /dev/null
+++ b/src/pt/mangaschan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangás Chan'
+ extClass = '.MangasChan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangaschan.net'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangaschan/res/mipmap-hdpi/ic_launcher.png b/src/pt/mangaschan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaschan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/mangaschan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaschan/res/mipmap-mdpi/ic_launcher.png b/src/pt/mangaschan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaschan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/mangaschan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaschan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/mangaschan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaschan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/mangaschan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaschan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/mangaschan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaschan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/mangaschan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaschan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/mangaschan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaschan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/mangaschan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaschan/src/MangasChan.kt b/src/pt/mangaschan/src/eu/kanade/tachiyomi/extension/pt/mangaschan/MangasChan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaschan/src/MangasChan.kt
rename to src/pt/mangaschan/src/eu/kanade/tachiyomi/extension/pt/mangaschan/MangasChan.kt
diff --git a/src/pt/mangasonline/build.gradle b/src/pt/mangasonline/build.gradle
new file mode 100644
index 000000000..c325b26a6
--- /dev/null
+++ b/src/pt/mangasonline/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangás Online'
+ extClass = '.MangasOnline'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangasonline.cc'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangasonline/src/MangasOnline.kt b/src/pt/mangasonline/src/eu/kanade/tachiyomi/extension/pt/mangasonline/MangasOnline.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangasonline/src/MangasOnline.kt
rename to src/pt/mangasonline/src/eu/kanade/tachiyomi/extension/pt/mangasonline/MangasOnline.kt
diff --git a/src/pt/mangasoverall/build.gradle b/src/pt/mangasoverall/build.gradle
new file mode 100644
index 000000000..b4fd14135
--- /dev/null
+++ b/src/pt/mangasoverall/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ROG Mangás'
+ extClass = '.RogMangas'
+ themePkg = 'madara'
+ baseUrl = 'https://rogmangas.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangasoverall/src/RogMangas.kt b/src/pt/mangasoverall/src/eu/kanade/tachiyomi/extension/pt/mangasoverall/RogMangas.kt
similarity index 100%
rename from multisrc/overrides/madara/mangasoverall/src/RogMangas.kt
rename to src/pt/mangasoverall/src/eu/kanade/tachiyomi/extension/pt/mangasoverall/RogMangas.kt
diff --git a/src/pt/manhastro/build.gradle b/src/pt/manhastro/build.gradle
new file mode 100644
index 000000000..5ec2de855
--- /dev/null
+++ b/src/pt/manhastro/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manhastro'
+ extClass = '.Manhastro'
+ themePkg = 'madara'
+ baseUrl = 'https://manhastro.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/manhastro/src/Manhastro.kt b/src/pt/manhastro/src/eu/kanade/tachiyomi/extension/pt/manhastro/Manhastro.kt
similarity index 100%
rename from multisrc/overrides/madara/manhastro/src/Manhastro.kt
rename to src/pt/manhastro/src/eu/kanade/tachiyomi/extension/pt/manhastro/Manhastro.kt
diff --git a/src/pt/minitwoscan/build.gradle b/src/pt/minitwoscan/build.gradle
new file mode 100644
index 000000000..fbe048071
--- /dev/null
+++ b/src/pt/minitwoscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MiniTwo Scan'
+ extClass = '.MiniTwoScan'
+ themePkg = 'madara'
+ baseUrl = 'https://minitwoscan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/minitwoscan/src/MiniTwoScan.kt b/src/pt/minitwoscan/src/eu/kanade/tachiyomi/extension/pt/minitwoscan/MiniTwoScan.kt
similarity index 100%
rename from multisrc/overrides/madara/minitwoscan/src/MiniTwoScan.kt
rename to src/pt/minitwoscan/src/eu/kanade/tachiyomi/extension/pt/minitwoscan/MiniTwoScan.kt
diff --git a/src/pt/modescanlator/build.gradle b/src/pt/modescanlator/build.gradle
new file mode 100644
index 000000000..231871d2d
--- /dev/null
+++ b/src/pt/modescanlator/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mode Scanlator'
+ extClass = '.ModeScanlator'
+ themePkg = 'peachscan'
+ baseUrl = 'https://modescanlator.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/peachscan/modescanlator/res/mipmap-hdpi/ic_launcher.png b/src/pt/modescanlator/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/modescanlator/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/modescanlator/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/modescanlator/res/mipmap-mdpi/ic_launcher.png b/src/pt/modescanlator/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/modescanlator/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/modescanlator/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/modescanlator/res/mipmap-xhdpi/ic_launcher.png b/src/pt/modescanlator/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/modescanlator/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/modescanlator/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/modescanlator/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/modescanlator/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/modescanlator/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/modescanlator/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/modescanlator/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/modescanlator/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/modescanlator/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/modescanlator/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/pt/modescanlator/src/eu/kanade/tachiyomi/extension/pt/modescanlator/ModeScanlator.kt b/src/pt/modescanlator/src/eu/kanade/tachiyomi/extension/pt/modescanlator/ModeScanlator.kt
new file mode 100644
index 000000000..effe24e8a
--- /dev/null
+++ b/src/pt/modescanlator/src/eu/kanade/tachiyomi/extension/pt/modescanlator/ModeScanlator.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.pt.modescanlator
+
+import eu.kanade.tachiyomi.multisrc.peachscan.PeachScan
+
+class ModeScanlator : PeachScan("Mode Scanlator", "https://modescanlator.com", "pt-BR")
diff --git a/src/pt/momonohanascan/build.gradle b/src/pt/momonohanascan/build.gradle
new file mode 100644
index 000000000..debc3b842
--- /dev/null
+++ b/src/pt/momonohanascan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Momo no Hana Scan'
+ extClass = '.MomoNoHanaScan'
+ themePkg = 'madara'
+ baseUrl = 'https://momonohanascan.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/momonohanascan/res/mipmap-hdpi/ic_launcher.png b/src/pt/momonohanascan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/momonohanascan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/momonohanascan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/momonohanascan/res/mipmap-mdpi/ic_launcher.png b/src/pt/momonohanascan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/momonohanascan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/momonohanascan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/momonohanascan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/momonohanascan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/momonohanascan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/momonohanascan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/momonohanascan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/momonohanascan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/momonohanascan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/momonohanascan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/momonohanascan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/momonohanascan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/momonohanascan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/momonohanascan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/momonohanascan/src/MomoNoHanaScan.kt b/src/pt/momonohanascan/src/eu/kanade/tachiyomi/extension/pt/momonohanascan/MomoNoHanaScan.kt
similarity index 100%
rename from multisrc/overrides/madara/momonohanascan/src/MomoNoHanaScan.kt
rename to src/pt/momonohanascan/src/eu/kanade/tachiyomi/extension/pt/momonohanascan/MomoNoHanaScan.kt
diff --git a/src/pt/moonloversscan/build.gradle b/src/pt/moonloversscan/build.gradle
new file mode 100644
index 000000000..fc5797c48
--- /dev/null
+++ b/src/pt/moonloversscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MoonLovers Scan'
+ extClass = '.MoonLoversScan'
+ themePkg = 'madara'
+ baseUrl = 'https://moonloversscan.com.br'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/moonloversscan/src/MoonLoversScan.kt b/src/pt/moonloversscan/src/eu/kanade/tachiyomi/extension/pt/moonloversscan/MoonLoversScan.kt
similarity index 100%
rename from multisrc/overrides/madara/moonloversscan/src/MoonLoversScan.kt
rename to src/pt/moonloversscan/src/eu/kanade/tachiyomi/extension/pt/moonloversscan/MoonLoversScan.kt
diff --git a/src/pt/moonwitchinlove/build.gradle b/src/pt/moonwitchinlove/build.gradle
new file mode 100644
index 000000000..8231be586
--- /dev/null
+++ b/src/pt/moonwitchinlove/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Moon Witch In Love'
+ extClass = '.MoonWitchInLove'
+ themePkg = 'madara'
+ baseUrl = 'https://moonwitchinlovescan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/moonwitchinlove/src/MoonWitchInLove.kt b/src/pt/moonwitchinlove/src/eu/kanade/tachiyomi/extension/pt/moonwitchinlove/MoonWitchInLove.kt
similarity index 100%
rename from multisrc/overrides/madara/moonwitchinlove/src/MoonWitchInLove.kt
rename to src/pt/moonwitchinlove/src/eu/kanade/tachiyomi/extension/pt/moonwitchinlove/MoonWitchInLove.kt
diff --git a/src/pt/mryaoifansub/build.gradle b/src/pt/mryaoifansub/build.gradle
new file mode 100644
index 000000000..acbeb9995
--- /dev/null
+++ b/src/pt/mryaoifansub/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MR Yaoi Fansub'
+ extClass = '.MrYaoiFansub'
+ themePkg = 'madara'
+ baseUrl = 'https://mrbenne.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mryaoifansub/src/MrYaoiFansub.kt b/src/pt/mryaoifansub/src/eu/kanade/tachiyomi/extension/pt/mryaoifansub/MrYaoiFansub.kt
similarity index 100%
rename from multisrc/overrides/madara/mryaoifansub/src/MrYaoiFansub.kt
rename to src/pt/mryaoifansub/src/eu/kanade/tachiyomi/extension/pt/mryaoifansub/MrYaoiFansub.kt
diff --git a/src/pt/nazarickscan/build.gradle b/src/pt/nazarickscan/build.gradle
new file mode 100644
index 000000000..03b9de311
--- /dev/null
+++ b/src/pt/nazarickscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Nazarick Scan'
+ extClass = '.NazarickScan'
+ themePkg = 'peachscan'
+ baseUrl = 'https://nazarickscan.com.br'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/peachscan/nazarickscan/res/mipmap-hdpi/ic_launcher.png b/src/pt/nazarickscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/nazarickscan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/nazarickscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/nazarickscan/res/mipmap-mdpi/ic_launcher.png b/src/pt/nazarickscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/nazarickscan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/nazarickscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/nazarickscan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/nazarickscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/nazarickscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/nazarickscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/nazarickscan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/nazarickscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/nazarickscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/nazarickscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/nazarickscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/nazarickscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/nazarickscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/nazarickscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/pt/nazarickscan/src/eu/kanade/tachiyomi/extension/pt/nazarickscan/NazarickScan.kt b/src/pt/nazarickscan/src/eu/kanade/tachiyomi/extension/pt/nazarickscan/NazarickScan.kt
new file mode 100644
index 000000000..88551f529
--- /dev/null
+++ b/src/pt/nazarickscan/src/eu/kanade/tachiyomi/extension/pt/nazarickscan/NazarickScan.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.pt.nazarickscan
+
+import eu.kanade.tachiyomi.multisrc.peachscan.PeachScan
+
+class NazarickScan : PeachScan("Nazarick Scan", "https://nazarickscan.com.br", "pt-BR")
diff --git a/src/pt/nexoscans/build.gradle b/src/pt/nexoscans/build.gradle
new file mode 100644
index 000000000..cb9457214
--- /dev/null
+++ b/src/pt/nexoscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Nexo Scans'
+ extClass = '.NexoScans'
+ themePkg = 'madara'
+ baseUrl = 'https://nexoscans.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/nexoscans/res/mipmap-hdpi/ic_launcher.png b/src/pt/nexoscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nexoscans/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/nexoscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nexoscans/res/mipmap-mdpi/ic_launcher.png b/src/pt/nexoscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nexoscans/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/nexoscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nexoscans/res/mipmap-xhdpi/ic_launcher.png b/src/pt/nexoscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nexoscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/nexoscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nexoscans/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/nexoscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nexoscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/nexoscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nexoscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/nexoscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nexoscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/nexoscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nexoscans/src/NexoScans.kt b/src/pt/nexoscans/src/eu/kanade/tachiyomi/extension/pt/nexoscans/NexoScans.kt
similarity index 100%
rename from multisrc/overrides/madara/nexoscans/src/NexoScans.kt
rename to src/pt/nexoscans/src/eu/kanade/tachiyomi/extension/pt/nexoscans/NexoScans.kt
diff --git a/src/pt/ninjascan/build.gradle b/src/pt/ninjascan/build.gradle
new file mode 100644
index 000000000..88e461b1f
--- /dev/null
+++ b/src/pt/ninjascan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Ninja Scan'
+ extClass = '.NinjaScan'
+ themePkg = 'madara'
+ baseUrl = 'https://ninjascan.site'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/ninjascan/res/mipmap-hdpi/ic_launcher.png b/src/pt/ninjascan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ninjascan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/ninjascan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ninjascan/res/mipmap-mdpi/ic_launcher.png b/src/pt/ninjascan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ninjascan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/ninjascan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ninjascan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/ninjascan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ninjascan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/ninjascan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ninjascan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/ninjascan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ninjascan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/ninjascan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ninjascan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/ninjascan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ninjascan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/ninjascan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ninjascan/src/NinjaScan.kt b/src/pt/ninjascan/src/eu/kanade/tachiyomi/extension/pt/ninjascan/NinjaScan.kt
similarity index 100%
rename from multisrc/overrides/madara/ninjascan/src/NinjaScan.kt
rename to src/pt/ninjascan/src/eu/kanade/tachiyomi/extension/pt/ninjascan/NinjaScan.kt
diff --git a/src/pt/nocturnesummer/build.gradle b/src/pt/nocturnesummer/build.gradle
new file mode 100644
index 000000000..2f6c89e93
--- /dev/null
+++ b/src/pt/nocturnesummer/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Nocturne Summer'
+ extClass = '.NocturneSummer'
+ themePkg = 'madara'
+ baseUrl = 'https://nocsummer.com.br'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/nocturnesummer/src/NocturneSummer.kt b/src/pt/nocturnesummer/src/eu/kanade/tachiyomi/extension/pt/nocturnesummer/NocturneSummer.kt
similarity index 100%
rename from multisrc/overrides/madara/nocturnesummer/src/NocturneSummer.kt
rename to src/pt/nocturnesummer/src/eu/kanade/tachiyomi/extension/pt/nocturnesummer/NocturneSummer.kt
diff --git a/src/pt/noindexscan/build.gradle b/src/pt/noindexscan/build.gradle
new file mode 100644
index 000000000..761190cb6
--- /dev/null
+++ b/src/pt/noindexscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'No Index Scan'
+ extClass = '.NoIndexScan'
+ themePkg = 'madara'
+ baseUrl = 'https://noindexscan.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/noindexscan/res/mipmap-hdpi/ic_launcher.png b/src/pt/noindexscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/noindexscan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/noindexscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/noindexscan/res/mipmap-mdpi/ic_launcher.png b/src/pt/noindexscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/noindexscan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/noindexscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/noindexscan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/noindexscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/noindexscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/noindexscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/noindexscan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/noindexscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/noindexscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/noindexscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/noindexscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/noindexscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/noindexscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/noindexscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/noindexscan/src/NoIndexScan.kt b/src/pt/noindexscan/src/eu/kanade/tachiyomi/extension/pt/noindexscan/NoIndexScan.kt
similarity index 100%
rename from multisrc/overrides/madara/noindexscan/src/NoIndexScan.kt
rename to src/pt/noindexscan/src/eu/kanade/tachiyomi/extension/pt/noindexscan/NoIndexScan.kt
diff --git a/src/pt/norterosescan/build.gradle b/src/pt/norterosescan/build.gradle
new file mode 100644
index 000000000..c02ec98cf
--- /dev/null
+++ b/src/pt/norterosescan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Norte Rose Scan'
+ extClass = '.NorteRoseScan'
+ themePkg = 'madara'
+ baseUrl = 'https://norterose.com.br'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/norterosescan/res/mipmap-hdpi/ic_launcher.png b/src/pt/norterosescan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/norterosescan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/norterosescan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/norterosescan/res/mipmap-mdpi/ic_launcher.png b/src/pt/norterosescan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/norterosescan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/norterosescan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/norterosescan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/norterosescan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/norterosescan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/norterosescan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/norterosescan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/norterosescan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/norterosescan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/norterosescan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/norterosescan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/norterosescan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/norterosescan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/norterosescan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/pt/norterosescan/src/eu/kanade/tachiyomi/extension/pt/norterosescan/NorteRoseScan.kt b/src/pt/norterosescan/src/eu/kanade/tachiyomi/extension/pt/norterosescan/NorteRoseScan.kt
new file mode 100644
index 000000000..8ccac67da
--- /dev/null
+++ b/src/pt/norterosescan/src/eu/kanade/tachiyomi/extension/pt/norterosescan/NorteRoseScan.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.pt.norterosescan
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class NorteRoseScan : Madara("Norte Rose Scan", "https://norterose.com.br", "pt-BR")
diff --git a/src/pt/origamiorpheans/build.gradle b/src/pt/origamiorpheans/build.gradle
new file mode 100644
index 000000000..91e4fbfad
--- /dev/null
+++ b/src/pt/origamiorpheans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Origami Orpheans'
+ extClass = '.OrigamiOrpheans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://origami-orpheans.com'
+ overrideVersionCode = 10
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/origamiorpheans/res/mipmap-hdpi/ic_launcher.png b/src/pt/origamiorpheans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/origamiorpheans/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/origamiorpheans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/origamiorpheans/res/mipmap-mdpi/ic_launcher.png b/src/pt/origamiorpheans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/origamiorpheans/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/origamiorpheans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/origamiorpheans/res/mipmap-xhdpi/ic_launcher.png b/src/pt/origamiorpheans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/origamiorpheans/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/origamiorpheans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/origamiorpheans/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/origamiorpheans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/origamiorpheans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/origamiorpheans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/origamiorpheans/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/origamiorpheans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/origamiorpheans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/origamiorpheans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/origamiorpheans/src/OrigamiOrpheans.kt b/src/pt/origamiorpheans/src/eu/kanade/tachiyomi/extension/pt/origamiorpheans/OrigamiOrpheans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/origamiorpheans/src/OrigamiOrpheans.kt
rename to src/pt/origamiorpheans/src/eu/kanade/tachiyomi/extension/pt/origamiorpheans/OrigamiOrpheans.kt
diff --git a/src/pt/passamaoscan/build.gradle b/src/pt/passamaoscan/build.gradle
new file mode 100644
index 000000000..6152c4b63
--- /dev/null
+++ b/src/pt/passamaoscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Passa Mão Scan'
+ extClass = '.PassaMaoScan'
+ themePkg = 'madara'
+ baseUrl = 'https://passamaoscan.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/passamaoscan/src/PassaMaoScan.kt b/src/pt/passamaoscan/src/eu/kanade/tachiyomi/extension/pt/passamaoscan/PassaMaoScan.kt
similarity index 100%
rename from multisrc/overrides/madara/passamaoscan/src/PassaMaoScan.kt
rename to src/pt/passamaoscan/src/eu/kanade/tachiyomi/extension/pt/passamaoscan/PassaMaoScan.kt
diff --git a/src/pt/pinkseaunicorn/build.gradle b/src/pt/pinkseaunicorn/build.gradle
new file mode 100644
index 000000000..2ca60eaca
--- /dev/null
+++ b/src/pt/pinkseaunicorn/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Pink Sea Unicorn'
+ extClass = '.PinkSeaUnicorn'
+ themePkg = 'madara'
+ baseUrl = 'https://psunicorn.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/pinkseaunicorn/src/PinkSeaUnicorn.kt b/src/pt/pinkseaunicorn/src/eu/kanade/tachiyomi/extension/pt/pinkseaunicorn/PinkSeaUnicorn.kt
similarity index 100%
rename from multisrc/overrides/madara/pinkseaunicorn/src/PinkSeaUnicorn.kt
rename to src/pt/pinkseaunicorn/src/eu/kanade/tachiyomi/extension/pt/pinkseaunicorn/PinkSeaUnicorn.kt
diff --git a/src/pt/pirulitorosa/build.gradle b/src/pt/pirulitorosa/build.gradle
new file mode 100644
index 000000000..f4cf689e4
--- /dev/null
+++ b/src/pt/pirulitorosa/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Pirulito Rosa'
+ extClass = '.PirulitoRosa'
+ themePkg = 'madara'
+ baseUrl = 'https://pirulitorosa.site'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/pirulitorosa/res/mipmap-hdpi/ic_launcher.png b/src/pt/pirulitorosa/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pirulitorosa/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/pirulitorosa/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pirulitorosa/res/mipmap-mdpi/ic_launcher.png b/src/pt/pirulitorosa/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pirulitorosa/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/pirulitorosa/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pirulitorosa/res/mipmap-xhdpi/ic_launcher.png b/src/pt/pirulitorosa/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pirulitorosa/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/pirulitorosa/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pirulitorosa/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/pirulitorosa/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pirulitorosa/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/pirulitorosa/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pirulitorosa/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/pirulitorosa/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/pirulitorosa/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/pirulitorosa/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/pirulitorosa/src/PirulitoRosa.kt b/src/pt/pirulitorosa/src/eu/kanade/tachiyomi/extension/pt/pirulitorosa/PirulitoRosa.kt
similarity index 100%
rename from multisrc/overrides/madara/pirulitorosa/src/PirulitoRosa.kt
rename to src/pt/pirulitorosa/src/eu/kanade/tachiyomi/extension/pt/pirulitorosa/PirulitoRosa.kt
diff --git a/src/pt/portalyaoi/build.gradle b/src/pt/portalyaoi/build.gradle
new file mode 100644
index 000000000..c406c0c51
--- /dev/null
+++ b/src/pt/portalyaoi/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Portal Yaoi'
+ extClass = '.PortalYaoi'
+ themePkg = 'madara'
+ baseUrl = 'https://portalyaoi.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/portalyaoi/src/PortalYaoi.kt b/src/pt/portalyaoi/src/eu/kanade/tachiyomi/extension/pt/portalyaoi/PortalYaoi.kt
similarity index 100%
rename from multisrc/overrides/madara/portalyaoi/src/PortalYaoi.kt
rename to src/pt/portalyaoi/src/eu/kanade/tachiyomi/extension/pt/portalyaoi/PortalYaoi.kt
diff --git a/src/pt/prismahentais/build.gradle b/src/pt/prismahentais/build.gradle
new file mode 100644
index 000000000..7d655464e
--- /dev/null
+++ b/src/pt/prismahentais/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Prisma Hentais'
+ extClass = '.PrismaHentais'
+ themePkg = 'madara'
+ baseUrl = 'https://prismahentai.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/prismahentais/src/PrismaHentais.kt b/src/pt/prismahentais/src/eu/kanade/tachiyomi/extension/pt/prismahentais/PrismaHentais.kt
similarity index 100%
rename from multisrc/overrides/madara/prismahentais/src/PrismaHentais.kt
rename to src/pt/prismahentais/src/eu/kanade/tachiyomi/extension/pt/prismahentais/PrismaHentais.kt
diff --git a/src/pt/prismascans/build.gradle b/src/pt/prismascans/build.gradle
new file mode 100644
index 000000000..fe6e3a859
--- /dev/null
+++ b/src/pt/prismascans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Demon Sect'
+ extClass = '.DemonSect'
+ themePkg = 'madara'
+ baseUrl = 'https://demonsect.com.br'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/prismascans/res/mipmap-hdpi/ic_launcher.png b/src/pt/prismascans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/prismascans/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/prismascans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/prismascans/res/mipmap-mdpi/ic_launcher.png b/src/pt/prismascans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/prismascans/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/prismascans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/prismascans/res/mipmap-xhdpi/ic_launcher.png b/src/pt/prismascans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/prismascans/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/prismascans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/prismascans/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/prismascans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/prismascans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/prismascans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/prismascans/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/prismascans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/prismascans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/prismascans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/prismascans/src/DemonSect.kt b/src/pt/prismascans/src/eu/kanade/tachiyomi/extension/pt/prismascans/DemonSect.kt
similarity index 100%
rename from multisrc/overrides/madara/prismascans/src/DemonSect.kt
rename to src/pt/prismascans/src/eu/kanade/tachiyomi/extension/pt/prismascans/DemonSect.kt
diff --git a/src/pt/rainbowfairyscan/build.gradle b/src/pt/rainbowfairyscan/build.gradle
new file mode 100644
index 000000000..2dab5b1f6
--- /dev/null
+++ b/src/pt/rainbowfairyscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Rainbow Fairy Scan'
+ extClass = '.RainbowFairyScan'
+ themePkg = 'madara'
+ baseUrl = 'https://rainbowfairyscan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/rainbowfairyscan/src/RainbowFairyScan.kt b/src/pt/rainbowfairyscan/src/eu/kanade/tachiyomi/extension/pt/rainbowfairyscan/RainbowFairyScan.kt
similarity index 100%
rename from multisrc/overrides/madara/rainbowfairyscan/src/RainbowFairyScan.kt
rename to src/pt/rainbowfairyscan/src/eu/kanade/tachiyomi/extension/pt/rainbowfairyscan/RainbowFairyScan.kt
diff --git a/src/pt/randomscan/build.gradle b/src/pt/randomscan/build.gradle
new file mode 100644
index 000000000..4fd533fed
--- /dev/null
+++ b/src/pt/randomscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Lura Toon'
+ extClass = '.LuraToon'
+ themePkg = 'madara'
+ baseUrl = 'https://luratoon.com'
+ overrideVersionCode = 7
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/randomscan/res/mipmap-hdpi/ic_launcher.png b/src/pt/randomscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/randomscan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/randomscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/randomscan/res/mipmap-mdpi/ic_launcher.png b/src/pt/randomscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/randomscan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/randomscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/randomscan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/randomscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/randomscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/randomscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/randomscan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/randomscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/randomscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/randomscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/randomscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/randomscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/randomscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/randomscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/randomscan/src/LuraToon.kt b/src/pt/randomscan/src/eu/kanade/tachiyomi/extension/pt/randomscan/LuraToon.kt
similarity index 100%
rename from multisrc/overrides/madara/randomscan/src/LuraToon.kt
rename to src/pt/randomscan/src/eu/kanade/tachiyomi/extension/pt/randomscan/LuraToon.kt
diff --git a/src/pt/rfdragonscan/build.gradle b/src/pt/rfdragonscan/build.gradle
new file mode 100644
index 000000000..a0b2a77ed
--- /dev/null
+++ b/src/pt/rfdragonscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'RF Dragon Scan'
+ extClass = '.RFDragonScan'
+ themePkg = 'peachscan'
+ baseUrl = 'https://rfdragonscan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/peachscan/rfdragonscan/res/mipmap-hdpi/ic_launcher.png b/src/pt/rfdragonscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/rfdragonscan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/rfdragonscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/rfdragonscan/res/mipmap-mdpi/ic_launcher.png b/src/pt/rfdragonscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/rfdragonscan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/rfdragonscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/rfdragonscan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/rfdragonscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/rfdragonscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/rfdragonscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/rfdragonscan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/rfdragonscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/rfdragonscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/rfdragonscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/rfdragonscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/rfdragonscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/rfdragonscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/rfdragonscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/pt/rfdragonscan/src/eu/kanade/tachiyomi/extension/pt/rfdragonscan/RFDragonScan.kt b/src/pt/rfdragonscan/src/eu/kanade/tachiyomi/extension/pt/rfdragonscan/RFDragonScan.kt
new file mode 100644
index 000000000..e915d1f36
--- /dev/null
+++ b/src/pt/rfdragonscan/src/eu/kanade/tachiyomi/extension/pt/rfdragonscan/RFDragonScan.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.pt.rfdragonscan
+
+import eu.kanade.tachiyomi.multisrc.peachscan.PeachScan
+
+class RFDragonScan : PeachScan("RF Dragon Scan", "https://rfdragonscan.com", "pt-BR")
diff --git a/src/pt/silencescan/build.gradle b/src/pt/silencescan/build.gradle
new file mode 100644
index 000000000..f1d75298f
--- /dev/null
+++ b/src/pt/silencescan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Silence Scan'
+ extClass = '.SilenceScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://silencescan.com.br'
+ overrideVersionCode = 5
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/silencescan/res/mipmap-hdpi/ic_launcher.png b/src/pt/silencescan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/silencescan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/silencescan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/silencescan/res/mipmap-mdpi/ic_launcher.png b/src/pt/silencescan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/silencescan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/silencescan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/silencescan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/silencescan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/silencescan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/silencescan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/silencescan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/silencescan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/silencescan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/silencescan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/silencescan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/silencescan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/silencescan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/silencescan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/silencescan/src/SilenceScan.kt b/src/pt/silencescan/src/eu/kanade/tachiyomi/extension/pt/silencescan/SilenceScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/silencescan/src/SilenceScan.kt
rename to src/pt/silencescan/src/eu/kanade/tachiyomi/extension/pt/silencescan/SilenceScan.kt
diff --git a/src/pt/sinensis/build.gradle b/src/pt/sinensis/build.gradle
new file mode 100644
index 000000000..1f0cb81ca
--- /dev/null
+++ b/src/pt/sinensis/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sinensis Scan'
+ extClass = '.SinensisScan'
+ themePkg = 'madara'
+ baseUrl = 'https://sinensisscan.net'
+ overrideVersionCode = 6
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/sinensis/res/mipmap-hdpi/ic_launcher.png b/src/pt/sinensis/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sinensis/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/sinensis/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sinensis/res/mipmap-mdpi/ic_launcher.png b/src/pt/sinensis/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sinensis/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/sinensis/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sinensis/res/mipmap-xhdpi/ic_launcher.png b/src/pt/sinensis/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sinensis/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/sinensis/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sinensis/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/sinensis/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sinensis/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/sinensis/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sinensis/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/sinensis/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sinensis/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/sinensis/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sinensis/src/SinensisScan.kt b/src/pt/sinensis/src/eu/kanade/tachiyomi/extension/pt/sinensis/SinensisScan.kt
similarity index 100%
rename from multisrc/overrides/madara/sinensis/src/SinensisScan.kt
rename to src/pt/sinensis/src/eu/kanade/tachiyomi/extension/pt/sinensis/SinensisScan.kt
diff --git a/src/pt/sssscanlator/build.gradle b/src/pt/sssscanlator/build.gradle
new file mode 100644
index 000000000..b0eb090b6
--- /dev/null
+++ b/src/pt/sssscanlator/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'SSSScanlator'
+ extClass = '.SSSScanlator'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://sssscanlator.com.br'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/sssscanlator/src/SSSScanlator.kt b/src/pt/sssscanlator/src/eu/kanade/tachiyomi/extension/pt/sssscanlator/SSSScanlator.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/sssscanlator/src/SSSScanlator.kt
rename to src/pt/sssscanlator/src/eu/kanade/tachiyomi/extension/pt/sssscanlator/SSSScanlator.kt
diff --git a/src/pt/starlightscan/build.gradle b/src/pt/starlightscan/build.gradle
new file mode 100644
index 000000000..285d73621
--- /dev/null
+++ b/src/pt/starlightscan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Starlight Scan'
+ extClass = '.StarlightScan'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://starligthscan.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/starlightscan/src/StarlightScan.kt b/src/pt/starlightscan/src/eu/kanade/tachiyomi/extension/pt/starlightscan/StarlightScan.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/starlightscan/src/StarlightScan.kt
rename to src/pt/starlightscan/src/eu/kanade/tachiyomi/extension/pt/starlightscan/StarlightScan.kt
diff --git a/src/pt/sussyscan/build.gradle b/src/pt/sussyscan/build.gradle
new file mode 100644
index 000000000..088e2a307
--- /dev/null
+++ b/src/pt/sussyscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sussy Scan'
+ extClass = '.SussyScan'
+ themePkg = 'madara'
+ baseUrl = 'https://sussyscan.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/sussyscan/res/mipmap-hdpi/ic_launcher.png b/src/pt/sussyscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sussyscan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/sussyscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sussyscan/res/mipmap-mdpi/ic_launcher.png b/src/pt/sussyscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sussyscan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/sussyscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sussyscan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/sussyscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sussyscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/sussyscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sussyscan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/sussyscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sussyscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/sussyscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sussyscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/sussyscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sussyscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/sussyscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sussyscan/src/SussyScan.kt b/src/pt/sussyscan/src/eu/kanade/tachiyomi/extension/pt/sussyscan/SussyScan.kt
similarity index 100%
rename from multisrc/overrides/madara/sussyscan/src/SussyScan.kt
rename to src/pt/sussyscan/src/eu/kanade/tachiyomi/extension/pt/sussyscan/SussyScan.kt
diff --git a/src/pt/sweettimescan/build.gradle b/src/pt/sweettimescan/build.gradle
new file mode 100644
index 000000000..80be8611d
--- /dev/null
+++ b/src/pt/sweettimescan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sweet Time Scan'
+ extClass = '.SweetTimeScan'
+ themePkg = 'madara'
+ baseUrl = 'https://sweetscan.net'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/sweettimescan/res/mipmap-hdpi/ic_launcher.png b/src/pt/sweettimescan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sweettimescan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/sweettimescan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sweettimescan/res/mipmap-mdpi/ic_launcher.png b/src/pt/sweettimescan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sweettimescan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/sweettimescan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sweettimescan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/sweettimescan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sweettimescan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/sweettimescan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sweettimescan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/sweettimescan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sweettimescan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/sweettimescan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sweettimescan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/sweettimescan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/sweettimescan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/sweettimescan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/sweettimescan/src/SweetTimeScan.kt b/src/pt/sweettimescan/src/eu/kanade/tachiyomi/extension/pt/sweettimescan/SweetTimeScan.kt
similarity index 100%
rename from multisrc/overrides/madara/sweettimescan/src/SweetTimeScan.kt
rename to src/pt/sweettimescan/src/eu/kanade/tachiyomi/extension/pt/sweettimescan/SweetTimeScan.kt
diff --git a/src/pt/tankouhentai/build.gradle b/src/pt/tankouhentai/build.gradle
new file mode 100644
index 000000000..3811c9f5e
--- /dev/null
+++ b/src/pt/tankouhentai/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Tankou Hentai'
+ extClass = '.TankouHentai'
+ themePkg = 'madara'
+ baseUrl = 'https://tankouhentai.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/tankouhentai/src/TankouHentai.kt b/src/pt/tankouhentai/src/eu/kanade/tachiyomi/extension/pt/tankouhentai/TankouHentai.kt
similarity index 100%
rename from multisrc/overrides/madara/tankouhentai/src/TankouHentai.kt
rename to src/pt/tankouhentai/src/eu/kanade/tachiyomi/extension/pt/tankouhentai/TankouHentai.kt
diff --git a/src/pt/tatakaescan/build.gradle b/src/pt/tatakaescan/build.gradle
new file mode 100644
index 000000000..7308ab159
--- /dev/null
+++ b/src/pt/tatakaescan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Tatakae Scan'
+ extClass = '.TatakaeScan'
+ themePkg = 'madara'
+ baseUrl = 'https://tatakaescan.com'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/tatakaescan/res/mipmap-hdpi/ic_launcher.png b/src/pt/tatakaescan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tatakaescan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/tatakaescan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tatakaescan/res/mipmap-mdpi/ic_launcher.png b/src/pt/tatakaescan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tatakaescan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/tatakaescan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tatakaescan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/tatakaescan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tatakaescan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/tatakaescan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tatakaescan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/tatakaescan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tatakaescan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/tatakaescan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tatakaescan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/tatakaescan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tatakaescan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/tatakaescan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tatakaescan/src/TatakaeScan.kt b/src/pt/tatakaescan/src/eu/kanade/tachiyomi/extension/pt/tatakaescan/TatakaeScan.kt
similarity index 100%
rename from multisrc/overrides/madara/tatakaescan/src/TatakaeScan.kt
rename to src/pt/tatakaescan/src/eu/kanade/tachiyomi/extension/pt/tatakaescan/TatakaeScan.kt
diff --git a/src/pt/tsundokutraducoes/build.gradle b/src/pt/tsundokutraducoes/build.gradle
new file mode 100644
index 000000000..9f91e14e0
--- /dev/null
+++ b/src/pt/tsundokutraducoes/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Tsundoku Traduções'
+ extClass = '.TsundokuTraducoes'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://tsundoku.com.br'
+ overrideVersionCode = 9
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/tsundokutraducoes/res/mipmap-hdpi/ic_launcher.png b/src/pt/tsundokutraducoes/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tsundokutraducoes/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/tsundokutraducoes/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tsundokutraducoes/res/mipmap-mdpi/ic_launcher.png b/src/pt/tsundokutraducoes/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tsundokutraducoes/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/tsundokutraducoes/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tsundokutraducoes/res/mipmap-xhdpi/ic_launcher.png b/src/pt/tsundokutraducoes/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tsundokutraducoes/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/tsundokutraducoes/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tsundokutraducoes/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/tsundokutraducoes/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tsundokutraducoes/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/tsundokutraducoes/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tsundokutraducoes/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/tsundokutraducoes/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tsundokutraducoes/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/tsundokutraducoes/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tsundokutraducoes/src/TsundokuTraducoes.kt b/src/pt/tsundokutraducoes/src/eu/kanade/tachiyomi/extension/pt/tsundokutraducoes/TsundokuTraducoes.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/tsundokutraducoes/src/TsundokuTraducoes.kt
rename to src/pt/tsundokutraducoes/src/eu/kanade/tachiyomi/extension/pt/tsundokutraducoes/TsundokuTraducoes.kt
diff --git a/src/pt/tyrantscans/build.gradle b/src/pt/tyrantscans/build.gradle
new file mode 100644
index 000000000..f6cb3b5cf
--- /dev/null
+++ b/src/pt/tyrantscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Tyrant Scans'
+ extClass = '.TyrantScans'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://www.tyrantscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/tyrantscans/res/mipmap-hdpi/ic_launcher.png b/src/pt/tyrantscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/tyrantscans/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/tyrantscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/tyrantscans/res/mipmap-mdpi/ic_launcher.png b/src/pt/tyrantscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/tyrantscans/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/tyrantscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/tyrantscans/res/mipmap-xhdpi/ic_launcher.png b/src/pt/tyrantscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/tyrantscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/tyrantscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/tyrantscans/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/tyrantscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/tyrantscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/tyrantscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/tyrantscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/tyrantscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/tyrantscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/tyrantscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/tyrantscans/src/TyrantScans.kt b/src/pt/tyrantscans/src/eu/kanade/tachiyomi/extension/pt/tyrantscans/TyrantScans.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/tyrantscans/src/TyrantScans.kt
rename to src/pt/tyrantscans/src/eu/kanade/tachiyomi/extension/pt/tyrantscans/TyrantScans.kt
diff --git a/src/pt/universohentai/build.gradle b/src/pt/universohentai/build.gradle
new file mode 100644
index 000000000..78a5348ea
--- /dev/null
+++ b/src/pt/universohentai/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Universo Hentai'
+ extClass = '.UniversoHentai'
+ themePkg = 'gattsu'
+ baseUrl = 'https://universohentai.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/gattsu/universohentai/res/mipmap-hdpi/ic_launcher.png b/src/pt/universohentai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/universohentai/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/universohentai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/universohentai/res/mipmap-mdpi/ic_launcher.png b/src/pt/universohentai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/universohentai/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/universohentai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/universohentai/res/mipmap-xhdpi/ic_launcher.png b/src/pt/universohentai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/universohentai/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/universohentai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/universohentai/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/universohentai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/universohentai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/universohentai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/universohentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/universohentai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/gattsu/universohentai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/universohentai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/gattsu/universohentai/src/UniversoHentai.kt b/src/pt/universohentai/src/eu/kanade/tachiyomi/extension/pt/universohentai/UniversoHentai.kt
similarity index 100%
rename from multisrc/overrides/gattsu/universohentai/src/UniversoHentai.kt
rename to src/pt/universohentai/src/eu/kanade/tachiyomi/extension/pt/universohentai/UniversoHentai.kt
diff --git a/src/pt/valkyriescan/build.gradle b/src/pt/valkyriescan/build.gradle
new file mode 100644
index 000000000..2668f51d7
--- /dev/null
+++ b/src/pt/valkyriescan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Valkyrie Scan'
+ extClass = '.ValkyrieScan'
+ themePkg = 'madara'
+ baseUrl = 'https://valkyriescan.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/valkyriescan/src/ValkyrieScan.kt b/src/pt/valkyriescan/src/eu/kanade/tachiyomi/extension/pt/valkyriescan/ValkyrieScan.kt
similarity index 100%
rename from multisrc/overrides/madara/valkyriescan/src/ValkyrieScan.kt
rename to src/pt/valkyriescan/src/eu/kanade/tachiyomi/extension/pt/valkyriescan/ValkyrieScan.kt
diff --git a/src/pt/wickedwitchscannovo/build.gradle b/src/pt/wickedwitchscannovo/build.gradle
new file mode 100644
index 000000000..c60ffc0ec
--- /dev/null
+++ b/src/pt/wickedwitchscannovo/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Wicked Witch Scan'
+ extClass = '.WickedWitchScan'
+ themePkg = 'peachscan'
+ baseUrl = 'https://wicked-witch-scan.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/peachscan/wickedwitchscannovo/res/mipmap-hdpi/ic_launcher.png b/src/pt/wickedwitchscannovo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/wickedwitchscannovo/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/wickedwitchscannovo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/wickedwitchscannovo/res/mipmap-mdpi/ic_launcher.png b/src/pt/wickedwitchscannovo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/wickedwitchscannovo/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/wickedwitchscannovo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/wickedwitchscannovo/res/mipmap-xhdpi/ic_launcher.png b/src/pt/wickedwitchscannovo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/wickedwitchscannovo/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/wickedwitchscannovo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/wickedwitchscannovo/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/wickedwitchscannovo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/wickedwitchscannovo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/wickedwitchscannovo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/wickedwitchscannovo/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/wickedwitchscannovo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/peachscan/wickedwitchscannovo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/wickedwitchscannovo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/peachscan/wickedwitchscannovo/src/WickedWitchScan.kt b/src/pt/wickedwitchscannovo/src/eu/kanade/tachiyomi/extension/pt/wickedwitchscannovo/WickedWitchScan.kt
similarity index 100%
rename from multisrc/overrides/peachscan/wickedwitchscannovo/src/WickedWitchScan.kt
rename to src/pt/wickedwitchscannovo/src/eu/kanade/tachiyomi/extension/pt/wickedwitchscannovo/WickedWitchScan.kt
diff --git a/src/pt/winterscan/build.gradle b/src/pt/winterscan/build.gradle
new file mode 100644
index 000000000..567770969
--- /dev/null
+++ b/src/pt/winterscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Winter Scan'
+ extClass = '.WinterScan'
+ themePkg = 'madara'
+ baseUrl = 'https://winterscan.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/winterscan/res/mipmap-hdpi/ic_launcher.png b/src/pt/winterscan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/winterscan/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/winterscan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/winterscan/res/mipmap-mdpi/ic_launcher.png b/src/pt/winterscan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/winterscan/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/winterscan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/winterscan/res/mipmap-xhdpi/ic_launcher.png b/src/pt/winterscan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/winterscan/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/winterscan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/winterscan/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/winterscan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/winterscan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/winterscan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/winterscan/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/winterscan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/winterscan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/winterscan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/winterscan/src/WinterScan.kt b/src/pt/winterscan/src/eu/kanade/tachiyomi/extension/pt/winterscan/WinterScan.kt
similarity index 100%
rename from multisrc/overrides/madara/winterscan/src/WinterScan.kt
rename to src/pt/winterscan/src/eu/kanade/tachiyomi/extension/pt/winterscan/WinterScan.kt
diff --git a/src/pt/wonderlandscan/build.gradle b/src/pt/wonderlandscan/build.gradle
new file mode 100644
index 000000000..0bfc1633d
--- /dev/null
+++ b/src/pt/wonderlandscan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Wonderland Scan'
+ extClass = '.WonderlandScan'
+ themePkg = 'madara'
+ baseUrl = 'https://wonderlandscan.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/wonderlandscan/src/WonderlandScan.kt b/src/pt/wonderlandscan/src/eu/kanade/tachiyomi/extension/pt/wonderlandscan/WonderlandScan.kt
similarity index 100%
rename from multisrc/overrides/madara/wonderlandscan/src/WonderlandScan.kt
rename to src/pt/wonderlandscan/src/eu/kanade/tachiyomi/extension/pt/wonderlandscan/WonderlandScan.kt
diff --git a/src/pt/yanpfansub/build.gradle b/src/pt/yanpfansub/build.gradle
new file mode 100644
index 000000000..63574ca66
--- /dev/null
+++ b/src/pt/yanpfansub/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'YANP Fansub'
+ extClass = '.YANPFansub'
+ themePkg = 'madara'
+ baseUrl = 'https://yanpfansub.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/yanpfansub/src/YANPFansub.kt b/src/pt/yanpfansub/src/eu/kanade/tachiyomi/extension/pt/yanpfansub/YANPFansub.kt
similarity index 100%
rename from multisrc/overrides/madara/yanpfansub/src/YANPFansub.kt
rename to src/pt/yanpfansub/src/eu/kanade/tachiyomi/extension/pt/yanpfansub/YANPFansub.kt
diff --git a/src/pt/yaoicomics/build.gradle b/src/pt/yaoicomics/build.gradle
new file mode 100644
index 000000000..ec9acf8fd
--- /dev/null
+++ b/src/pt/yaoicomics/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Yaoi Comics'
+ extClass = '.YaoiComics'
+ themePkg = 'madara'
+ baseUrl = 'https://ycscan.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/yaoicomics/src/YaoiComics.kt b/src/pt/yaoicomics/src/eu/kanade/tachiyomi/extension/pt/yaoicomics/YaoiComics.kt
similarity index 100%
rename from multisrc/overrides/madara/yaoicomics/src/YaoiComics.kt
rename to src/pt/yaoicomics/src/eu/kanade/tachiyomi/extension/pt/yaoicomics/YaoiComics.kt
diff --git a/src/pt/yuriverso/build.gradle b/src/pt/yuriverso/build.gradle
new file mode 100644
index 000000000..107ae2479
--- /dev/null
+++ b/src/pt/yuriverso/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Yuri Verso'
+ extClass = '.YuriVerso'
+ themePkg = 'madara'
+ baseUrl = 'https://yuri.live'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/yuriverso/res/mipmap-hdpi/ic_launcher.png b/src/pt/yuriverso/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yuriverso/res/mipmap-hdpi/ic_launcher.png
rename to src/pt/yuriverso/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yuriverso/res/mipmap-mdpi/ic_launcher.png b/src/pt/yuriverso/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yuriverso/res/mipmap-mdpi/ic_launcher.png
rename to src/pt/yuriverso/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yuriverso/res/mipmap-xhdpi/ic_launcher.png b/src/pt/yuriverso/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yuriverso/res/mipmap-xhdpi/ic_launcher.png
rename to src/pt/yuriverso/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yuriverso/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/yuriverso/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yuriverso/res/mipmap-xxhdpi/ic_launcher.png
rename to src/pt/yuriverso/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yuriverso/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/yuriverso/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/yuriverso/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/pt/yuriverso/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/yuriverso/src/YuriVerso.kt b/src/pt/yuriverso/src/eu/kanade/tachiyomi/extension/pt/yuriverso/YuriVerso.kt
similarity index 100%
rename from multisrc/overrides/madara/yuriverso/src/YuriVerso.kt
rename to src/pt/yuriverso/src/eu/kanade/tachiyomi/extension/pt/yuriverso/YuriVerso.kt
diff --git a/src/ru/allhentai/build.gradle b/src/ru/allhentai/build.gradle
new file mode 100644
index 000000000..d7ce117a3
--- /dev/null
+++ b/src/ru/allhentai/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'AllHentai'
+ extClass = '.AllHentai'
+ themePkg = 'grouple'
+ baseUrl = 'https://z.allhen.online'
+ overrideVersionCode = 22
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/grouple/allhentai/res/mipmap-hdpi/ic_launcher.png b/src/ru/allhentai/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/allhentai/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/allhentai/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/allhentai/res/mipmap-mdpi/ic_launcher.png b/src/ru/allhentai/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/allhentai/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/allhentai/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/allhentai/res/mipmap-xhdpi/ic_launcher.png b/src/ru/allhentai/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/allhentai/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/allhentai/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/allhentai/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/allhentai/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/allhentai/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/allhentai/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/allhentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/allhentai/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/allhentai/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/allhentai/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/allhentai/src/AllHentai.kt b/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt
similarity index 100%
rename from multisrc/overrides/grouple/allhentai/src/AllHentai.kt
rename to src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt
diff --git a/src/ru/bestmanga/build.gradle b/src/ru/bestmanga/build.gradle
new file mode 100644
index 000000000..b28269abf
--- /dev/null
+++ b/src/ru/bestmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'BestManga'
+ extClass = '.BestManga'
+ themePkg = 'madara'
+ baseUrl = 'https://bestmanga.club'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/bestmanga/res/mipmap-hdpi/ic_launcher.png b/src/ru/bestmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bestmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/bestmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bestmanga/res/mipmap-mdpi/ic_launcher.png b/src/ru/bestmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bestmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/bestmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bestmanga/res/mipmap-xhdpi/ic_launcher.png b/src/ru/bestmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bestmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/bestmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bestmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/bestmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bestmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/bestmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bestmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/bestmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bestmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/bestmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bestmanga/src/BestManga.kt b/src/ru/bestmanga/src/eu/kanade/tachiyomi/extension/ru/bestmanga/BestManga.kt
similarity index 100%
rename from multisrc/overrides/madara/bestmanga/src/BestManga.kt
rename to src/ru/bestmanga/src/eu/kanade/tachiyomi/extension/ru/bestmanga/BestManga.kt
diff --git a/src/ru/henchan/build.gradle b/src/ru/henchan/build.gradle
new file mode 100644
index 000000000..a12d77b87
--- /dev/null
+++ b/src/ru/henchan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HenChan'
+ extClass = '.HenChan'
+ themePkg = 'multichan'
+ baseUrl = 'https://xxxxx.hentaichan.live'
+ overrideVersionCode = 38
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/multichan/henchan/res/mipmap-hdpi/ic_launcher.png b/src/ru/henchan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/henchan/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/henchan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/henchan/res/mipmap-mdpi/ic_launcher.png b/src/ru/henchan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/henchan/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/henchan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/henchan/res/mipmap-xhdpi/ic_launcher.png b/src/ru/henchan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/henchan/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/henchan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/henchan/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/henchan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/henchan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/henchan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/henchan/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/henchan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/henchan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/henchan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/henchan/src/HenChan.kt b/src/ru/henchan/src/eu/kanade/tachiyomi/extension/ru/henchan/HenChan.kt
similarity index 100%
rename from multisrc/overrides/multichan/henchan/src/HenChan.kt
rename to src/ru/henchan/src/eu/kanade/tachiyomi/extension/ru/henchan/HenChan.kt
diff --git a/multisrc/overrides/libgroup/hentailib/AndroidManifest.xml b/src/ru/hentailib/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/libgroup/hentailib/AndroidManifest.xml
rename to src/ru/hentailib/AndroidManifest.xml
diff --git a/src/ru/hentailib/build.gradle b/src/ru/hentailib/build.gradle
new file mode 100644
index 000000000..d6b90d65e
--- /dev/null
+++ b/src/ru/hentailib/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HentaiLib'
+ extClass = '.HentaiLib'
+ themePkg = 'libgroup'
+ baseUrl = 'https://hentailib.me'
+ overrideVersionCode = 19
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/libgroup/hentailib/res/mipmap-hdpi/ic_launcher.png b/src/ru/hentailib/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/hentailib/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/hentailib/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/hentailib/res/mipmap-mdpi/ic_launcher.png b/src/ru/hentailib/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/hentailib/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/hentailib/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/hentailib/res/mipmap-xhdpi/ic_launcher.png b/src/ru/hentailib/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/hentailib/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/hentailib/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/hentailib/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/hentailib/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/hentailib/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/hentailib/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/hentailib/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/hentailib/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/hentailib/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/hentailib/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/hentailib/src/HentaiLib.kt b/src/ru/hentailib/src/eu/kanade/tachiyomi/extension/ru/hentailib/HentaiLib.kt
similarity index 100%
rename from multisrc/overrides/libgroup/hentailib/src/HentaiLib.kt
rename to src/ru/hentailib/src/eu/kanade/tachiyomi/extension/ru/hentailib/HentaiLib.kt
diff --git a/src/ru/mangachan/build.gradle b/src/ru/mangachan/build.gradle
new file mode 100644
index 000000000..939e06059
--- /dev/null
+++ b/src/ru/mangachan/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaChan'
+ extClass = '.MangaChan'
+ themePkg = 'multichan'
+ baseUrl = 'https://manga-chan.me'
+ overrideVersionCode = 14
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/multichan/mangachan/res/mipmap-hdpi/ic_launcher.png b/src/ru/mangachan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/mangachan/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/mangachan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/mangachan/res/mipmap-mdpi/ic_launcher.png b/src/ru/mangachan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/mangachan/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/mangachan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/mangachan/res/mipmap-xhdpi/ic_launcher.png b/src/ru/mangachan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/mangachan/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/mangachan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/mangachan/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/mangachan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/mangachan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/mangachan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/mangachan/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/mangachan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/mangachan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/mangachan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/mangachan/src/MangaChan.kt b/src/ru/mangachan/src/eu/kanade/tachiyomi/extension/ru/mangachan/MangaChan.kt
similarity index 100%
rename from multisrc/overrides/multichan/mangachan/src/MangaChan.kt
rename to src/ru/mangachan/src/eu/kanade/tachiyomi/extension/ru/mangachan/MangaChan.kt
diff --git a/multisrc/overrides/libgroup/mangalib/AndroidManifest.xml b/src/ru/mangalib/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/libgroup/mangalib/AndroidManifest.xml
rename to src/ru/mangalib/AndroidManifest.xml
diff --git a/src/ru/mangalib/build.gradle b/src/ru/mangalib/build.gradle
new file mode 100644
index 000000000..9b281d731
--- /dev/null
+++ b/src/ru/mangalib/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaLib'
+ extClass = '.MangaLib'
+ themePkg = 'libgroup'
+ baseUrl = 'https://mangalib.me'
+ overrideVersionCode = 74
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/libgroup/mangalib/res/mipmap-hdpi/ic_launcher.png b/src/ru/mangalib/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/mangalib/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/mangalib/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/mangalib/res/mipmap-mdpi/ic_launcher.png b/src/ru/mangalib/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/mangalib/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/mangalib/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/mangalib/res/mipmap-xhdpi/ic_launcher.png b/src/ru/mangalib/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/mangalib/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/mangalib/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/mangalib/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/mangalib/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/mangalib/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/mangalib/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/mangalib/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/mangalib/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/mangalib/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/mangalib/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/mangalib/src/MangaLib.kt b/src/ru/mangalib/src/eu/kanade/tachiyomi/extension/ru/mangalib/MangaLib.kt
similarity index 100%
rename from multisrc/overrides/libgroup/mangalib/src/MangaLib.kt
rename to src/ru/mangalib/src/eu/kanade/tachiyomi/extension/ru/mangalib/MangaLib.kt
diff --git a/src/ru/mangamammy/build.gradle b/src/ru/mangamammy/build.gradle
new file mode 100644
index 000000000..316fbbe7d
--- /dev/null
+++ b/src/ru/mangamammy/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga Mammy'
+ extClass = '.MangaMammy'
+ themePkg = 'madara'
+ baseUrl = 'https://mangamammy.ru'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangamammy/res/mipmap-hdpi/ic_launcher.png b/src/ru/mangamammy/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamammy/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/mangamammy/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamammy/res/mipmap-mdpi/ic_launcher.png b/src/ru/mangamammy/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamammy/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/mangamammy/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamammy/res/mipmap-xhdpi/ic_launcher.png b/src/ru/mangamammy/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamammy/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/mangamammy/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamammy/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/mangamammy/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamammy/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/mangamammy/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamammy/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/mangamammy/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangamammy/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/mangamammy/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangamammy/src/MangaMammy.kt b/src/ru/mangamammy/src/eu/kanade/tachiyomi/extension/ru/mangamammy/MangaMammy.kt
similarity index 100%
rename from multisrc/overrides/madara/mangamammy/src/MangaMammy.kt
rename to src/ru/mangamammy/src/eu/kanade/tachiyomi/extension/ru/mangamammy/MangaMammy.kt
diff --git a/src/ru/mangaonelove/build.gradle b/src/ru/mangaonelove/build.gradle
new file mode 100644
index 000000000..1645cf9dc
--- /dev/null
+++ b/src/ru/mangaonelove/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga One Love'
+ extClass = '.MangaOneLove'
+ themePkg = 'madara'
+ baseUrl = 'https://mangaonelove.site'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangaonelove/res/mipmap-hdpi/ic_launcher.png b/src/ru/mangaonelove/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonelove/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/mangaonelove/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonelove/res/mipmap-mdpi/ic_launcher.png b/src/ru/mangaonelove/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonelove/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/mangaonelove/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonelove/res/mipmap-xhdpi/ic_launcher.png b/src/ru/mangaonelove/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonelove/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/mangaonelove/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonelove/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/mangaonelove/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonelove/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/mangaonelove/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonelove/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/mangaonelove/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangaonelove/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/mangaonelove/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangaonelove/src/MangaOneLove.kt b/src/ru/mangaonelove/src/eu/kanade/tachiyomi/extension/ru/mangaonelove/MangaOneLove.kt
similarity index 100%
rename from multisrc/overrides/madara/mangaonelove/src/MangaOneLove.kt
rename to src/ru/mangaonelove/src/eu/kanade/tachiyomi/extension/ru/mangaonelove/MangaOneLove.kt
diff --git a/src/ru/mintmanga/build.gradle b/src/ru/mintmanga/build.gradle
new file mode 100644
index 000000000..7f9ce0e4e
--- /dev/null
+++ b/src/ru/mintmanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'MintManga'
+ extClass = '.MintManga'
+ themePkg = 'grouple'
+ baseUrl = 'https://mintmanga.com'
+ overrideVersionCode = 46
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/grouple/mintmanga/res/mipmap-hdpi/ic_launcher.png b/src/ru/mintmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/mintmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/mintmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/mintmanga/res/mipmap-mdpi/ic_launcher.png b/src/ru/mintmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/mintmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/mintmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/mintmanga/res/mipmap-xhdpi/ic_launcher.png b/src/ru/mintmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/mintmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/mintmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/mintmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/mintmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/mintmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/mintmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/mintmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/mintmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/mintmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/mintmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/mintmanga/src/MintManga.kt b/src/ru/mintmanga/src/eu/kanade/tachiyomi/extension/ru/mintmanga/MintManga.kt
similarity index 100%
rename from multisrc/overrides/grouple/mintmanga/src/MintManga.kt
rename to src/ru/mintmanga/src/eu/kanade/tachiyomi/extension/ru/mintmanga/MintManga.kt
diff --git a/src/ru/readmanga/build.gradle b/src/ru/readmanga/build.gradle
new file mode 100644
index 000000000..e7c665ff1
--- /dev/null
+++ b/src/ru/readmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ReadManga'
+ extClass = '.ReadManga'
+ themePkg = 'grouple'
+ baseUrl = 'https://readmanga.live'
+ overrideVersionCode = 46
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/grouple/readmanga/res/mipmap-hdpi/ic_launcher.png b/src/ru/readmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/readmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/readmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/readmanga/res/mipmap-mdpi/ic_launcher.png b/src/ru/readmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/readmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/readmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/readmanga/res/mipmap-xhdpi/ic_launcher.png b/src/ru/readmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/readmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/readmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/readmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/readmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/readmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/readmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/readmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/readmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/readmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/readmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/readmanga/src/ReadManga.kt b/src/ru/readmanga/src/eu/kanade/tachiyomi/extension/ru/readmanga/ReadManga.kt
similarity index 100%
rename from multisrc/overrides/grouple/readmanga/src/ReadManga.kt
rename to src/ru/readmanga/src/eu/kanade/tachiyomi/extension/ru/readmanga/ReadManga.kt
diff --git a/src/ru/rumix/build.gradle b/src/ru/rumix/build.gradle
new file mode 100644
index 000000000..7073dadb3
--- /dev/null
+++ b/src/ru/rumix/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'RuMIX'
+ extClass = '.RuMIX'
+ themePkg = 'grouple'
+ baseUrl = 'https://rumix.me'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/grouple/rumix/res/mipmap-hdpi/ic_launcher.png b/src/ru/rumix/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/rumix/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/rumix/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/rumix/res/mipmap-mdpi/ic_launcher.png b/src/ru/rumix/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/rumix/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/rumix/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/rumix/res/mipmap-xhdpi/ic_launcher.png b/src/ru/rumix/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/rumix/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/rumix/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/rumix/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/rumix/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/rumix/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/rumix/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/rumix/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/rumix/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/rumix/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/rumix/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/rumix/src/RuMIX.kt b/src/ru/rumix/src/eu/kanade/tachiyomi/extension/ru/rumix/RuMIX.kt
similarity index 100%
rename from multisrc/overrides/grouple/rumix/src/RuMIX.kt
rename to src/ru/rumix/src/eu/kanade/tachiyomi/extension/ru/rumix/RuMIX.kt
diff --git a/src/ru/selfmanga/build.gradle b/src/ru/selfmanga/build.gradle
new file mode 100644
index 000000000..92fb90916
--- /dev/null
+++ b/src/ru/selfmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'SelfManga'
+ extClass = '.SelfManga'
+ themePkg = 'grouple'
+ baseUrl = 'https://selfmanga.live'
+ overrideVersionCode = 22
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/grouple/selfmanga/res/mipmap-hdpi/ic_launcher.png b/src/ru/selfmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/selfmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/selfmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/selfmanga/res/mipmap-mdpi/ic_launcher.png b/src/ru/selfmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/selfmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/selfmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/selfmanga/res/mipmap-xhdpi/ic_launcher.png b/src/ru/selfmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/selfmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/selfmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/selfmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/selfmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/selfmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/selfmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/selfmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/selfmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/grouple/selfmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/selfmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/grouple/selfmanga/src/SelfManga.kt b/src/ru/selfmanga/src/eu/kanade/tachiyomi/extension/ru/selfmanga/SelfManga.kt
similarity index 100%
rename from multisrc/overrides/grouple/selfmanga/src/SelfManga.kt
rename to src/ru/selfmanga/src/eu/kanade/tachiyomi/extension/ru/selfmanga/SelfManga.kt
diff --git a/src/ru/senkognito/build.gradle b/src/ru/senkognito/build.gradle
new file mode 100644
index 000000000..c32fd66f3
--- /dev/null
+++ b/src/ru/senkognito/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Senkognito'
+ extClass = '.Senkognito'
+ themePkg = 'senkuro'
+ baseUrl = 'https://senkognito.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/senkuro/senkognito/res/mipmap-hdpi/ic_launcher.png b/src/ru/senkognito/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/senkuro/senkognito/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/senkognito/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/senkuro/senkognito/res/mipmap-mdpi/ic_launcher.png b/src/ru/senkognito/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/senkuro/senkognito/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/senkognito/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/senkuro/senkognito/res/mipmap-xhdpi/ic_launcher.png b/src/ru/senkognito/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/senkuro/senkognito/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/senkognito/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/senkuro/senkognito/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/senkognito/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/senkuro/senkognito/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/senkognito/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/senkuro/senkognito/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/senkognito/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/senkuro/senkognito/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/senkognito/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/senkuro/senkognito/src/Senkognito.kt b/src/ru/senkognito/src/eu/kanade/tachiyomi/extension/ru/senkognito/Senkognito.kt
similarity index 100%
rename from multisrc/overrides/senkuro/senkognito/src/Senkognito.kt
rename to src/ru/senkognito/src/eu/kanade/tachiyomi/extension/ru/senkognito/Senkognito.kt
diff --git a/src/ru/senkuro/build.gradle b/src/ru/senkuro/build.gradle
new file mode 100644
index 000000000..d980223e3
--- /dev/null
+++ b/src/ru/senkuro/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Senkuro'
+ extClass = '.Senkuro'
+ themePkg = 'senkuro'
+ baseUrl = 'https://senkuro.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/senkuro/senkuro/res/mipmap-hdpi/ic_launcher.png b/src/ru/senkuro/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/senkuro/senkuro/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/senkuro/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/senkuro/senkuro/res/mipmap-mdpi/ic_launcher.png b/src/ru/senkuro/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/senkuro/senkuro/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/senkuro/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/senkuro/senkuro/res/mipmap-xhdpi/ic_launcher.png b/src/ru/senkuro/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/senkuro/senkuro/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/senkuro/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/senkuro/senkuro/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/senkuro/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/senkuro/senkuro/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/senkuro/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/senkuro/senkuro/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/senkuro/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/senkuro/senkuro/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/senkuro/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/senkuro/senkuro/src/Senkuro.kt b/src/ru/senkuro/src/eu/kanade/tachiyomi/extension/ru/senkuro/Senkuro.kt
similarity index 100%
rename from multisrc/overrides/senkuro/senkuro/src/Senkuro.kt
rename to src/ru/senkuro/src/eu/kanade/tachiyomi/extension/ru/senkuro/Senkuro.kt
diff --git a/src/ru/yaoichan/build.gradle b/src/ru/yaoichan/build.gradle
new file mode 100644
index 000000000..c839d900a
--- /dev/null
+++ b/src/ru/yaoichan/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'YaoiChan'
+ extClass = '.YaoiChan'
+ themePkg = 'multichan'
+ baseUrl = 'https://yaoi-chan.me'
+ overrideVersionCode = 4
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/multichan/yaoichan/res/mipmap-hdpi/ic_launcher.png b/src/ru/yaoichan/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/yaoichan/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/yaoichan/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/yaoichan/res/mipmap-mdpi/ic_launcher.png b/src/ru/yaoichan/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/yaoichan/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/yaoichan/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/yaoichan/res/mipmap-xhdpi/ic_launcher.png b/src/ru/yaoichan/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/yaoichan/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/yaoichan/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/yaoichan/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/yaoichan/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/yaoichan/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/yaoichan/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/yaoichan/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/yaoichan/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/multichan/yaoichan/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/yaoichan/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/multichan/yaoichan/src/YaoiChan.kt b/src/ru/yaoichan/src/eu/kanade/tachiyomi/extension/ru/yaoichan/YaoiChan.kt
similarity index 100%
rename from multisrc/overrides/multichan/yaoichan/src/YaoiChan.kt
rename to src/ru/yaoichan/src/eu/kanade/tachiyomi/extension/ru/yaoichan/YaoiChan.kt
diff --git a/multisrc/overrides/libgroup/yaoilib/AndroidManifest.xml b/src/ru/yaoilib/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/libgroup/yaoilib/AndroidManifest.xml
rename to src/ru/yaoilib/AndroidManifest.xml
diff --git a/src/ru/yaoilib/build.gradle b/src/ru/yaoilib/build.gradle
new file mode 100644
index 000000000..b28483028
--- /dev/null
+++ b/src/ru/yaoilib/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'YaoiLib'
+ extClass = '.YaoiLib'
+ themePkg = 'libgroup'
+ baseUrl = 'https://v1.slashlib.me'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/libgroup/yaoilib/res/mipmap-hdpi/ic_launcher.png b/src/ru/yaoilib/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/yaoilib/res/mipmap-hdpi/ic_launcher.png
rename to src/ru/yaoilib/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/yaoilib/res/mipmap-mdpi/ic_launcher.png b/src/ru/yaoilib/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/yaoilib/res/mipmap-mdpi/ic_launcher.png
rename to src/ru/yaoilib/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/yaoilib/res/mipmap-xhdpi/ic_launcher.png b/src/ru/yaoilib/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/yaoilib/res/mipmap-xhdpi/ic_launcher.png
rename to src/ru/yaoilib/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/yaoilib/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/yaoilib/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/yaoilib/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ru/yaoilib/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/yaoilib/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/yaoilib/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/libgroup/yaoilib/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ru/yaoilib/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/libgroup/yaoilib/src/YaoiLib.kt b/src/ru/yaoilib/src/eu/kanade/tachiyomi/extension/ru/yaoilib/YaoiLib.kt
similarity index 100%
rename from multisrc/overrides/libgroup/yaoilib/src/YaoiLib.kt
rename to src/ru/yaoilib/src/eu/kanade/tachiyomi/extension/ru/yaoilib/YaoiLib.kt
diff --git a/src/th/bakaman/build.gradle b/src/th/bakaman/build.gradle
new file mode 100644
index 000000000..f614bec76
--- /dev/null
+++ b/src/th/bakaman/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Bakaman'
+ extClass = '.Bakaman'
+ themePkg = 'madara'
+ baseUrl = 'https://bakaman.net'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/bakaman/res/mipmap-hdpi/ic_launcher.png b/src/th/bakaman/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bakaman/res/mipmap-hdpi/ic_launcher.png
rename to src/th/bakaman/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bakaman/res/mipmap-mdpi/ic_launcher.png b/src/th/bakaman/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bakaman/res/mipmap-mdpi/ic_launcher.png
rename to src/th/bakaman/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bakaman/res/mipmap-xhdpi/ic_launcher.png b/src/th/bakaman/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bakaman/res/mipmap-xhdpi/ic_launcher.png
rename to src/th/bakaman/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bakaman/res/mipmap-xxhdpi/ic_launcher.png b/src/th/bakaman/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bakaman/res/mipmap-xxhdpi/ic_launcher.png
rename to src/th/bakaman/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bakaman/res/mipmap-xxxhdpi/ic_launcher.png b/src/th/bakaman/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bakaman/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/th/bakaman/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/th/bakaman/src/eu/kanade/tachiyomi/extension/th/bakaman/Bakaman.kt b/src/th/bakaman/src/eu/kanade/tachiyomi/extension/th/bakaman/Bakaman.kt
new file mode 100644
index 000000000..9fd41a5f4
--- /dev/null
+++ b/src/th/bakaman/src/eu/kanade/tachiyomi/extension/th/bakaman/Bakaman.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.th.bakaman
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Bakaman : Madara("Bakaman", "https://bakaman.net", "th")
diff --git a/src/th/cat300/build.gradle b/src/th/cat300/build.gradle
new file mode 100644
index 000000000..4c0a84d11
--- /dev/null
+++ b/src/th/cat300/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Cat300'
+ extClass = '.Cat300'
+ themePkg = 'madara'
+ baseUrl = 'https://cat300.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/cat300/res/mipmap-hdpi/ic_launcher.png b/src/th/cat300/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cat300/res/mipmap-hdpi/ic_launcher.png
rename to src/th/cat300/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cat300/res/mipmap-mdpi/ic_launcher.png b/src/th/cat300/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cat300/res/mipmap-mdpi/ic_launcher.png
rename to src/th/cat300/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cat300/res/mipmap-xhdpi/ic_launcher.png b/src/th/cat300/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cat300/res/mipmap-xhdpi/ic_launcher.png
rename to src/th/cat300/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cat300/res/mipmap-xxhdpi/ic_launcher.png b/src/th/cat300/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cat300/res/mipmap-xxhdpi/ic_launcher.png
rename to src/th/cat300/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cat300/res/mipmap-xxxhdpi/ic_launcher.png b/src/th/cat300/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cat300/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/th/cat300/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/th/cat300/src/eu/kanade/tachiyomi/extension/th/cat300/Cat300.kt b/src/th/cat300/src/eu/kanade/tachiyomi/extension/th/cat300/Cat300.kt
new file mode 100644
index 000000000..6d072b253
--- /dev/null
+++ b/src/th/cat300/src/eu/kanade/tachiyomi/extension/th/cat300/Cat300.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.th.cat300
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Cat300 : Madara("Cat300", "https://cat300.com", "th")
diff --git a/src/th/cattranslator/build.gradle b/src/th/cattranslator/build.gradle
new file mode 100644
index 000000000..6550d14e6
--- /dev/null
+++ b/src/th/cattranslator/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'CAT-translator'
+ extClass = '.CatTranslator'
+ themePkg = 'madara'
+ baseUrl = 'https://cats-translator.com/manga'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/cattranslator/res/mipmap-hdpi/ic_launcher.png b/src/th/cattranslator/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cattranslator/res/mipmap-hdpi/ic_launcher.png
rename to src/th/cattranslator/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cattranslator/res/mipmap-mdpi/ic_launcher.png b/src/th/cattranslator/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cattranslator/res/mipmap-mdpi/ic_launcher.png
rename to src/th/cattranslator/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cattranslator/res/mipmap-xhdpi/ic_launcher.png b/src/th/cattranslator/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cattranslator/res/mipmap-xhdpi/ic_launcher.png
rename to src/th/cattranslator/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cattranslator/res/mipmap-xxhdpi/ic_launcher.png b/src/th/cattranslator/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cattranslator/res/mipmap-xxhdpi/ic_launcher.png
rename to src/th/cattranslator/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cattranslator/res/mipmap-xxxhdpi/ic_launcher.png b/src/th/cattranslator/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cattranslator/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/th/cattranslator/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cattranslator/src/CatTranslator.kt b/src/th/cattranslator/src/eu/kanade/tachiyomi/extension/th/cattranslator/CatTranslator.kt
similarity index 100%
rename from multisrc/overrides/madara/cattranslator/src/CatTranslator.kt
rename to src/th/cattranslator/src/eu/kanade/tachiyomi/extension/th/cattranslator/CatTranslator.kt
diff --git a/src/th/doodmanga/build.gradle b/src/th/doodmanga/build.gradle
new file mode 100644
index 000000000..e4e48d0a4
--- /dev/null
+++ b/src/th/doodmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Doodmanga'
+ extClass = '.Doodmanga'
+ themePkg = 'madara'
+ baseUrl = 'https://www.doodmanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/doodmanga/res/mipmap-hdpi/ic_launcher.png b/src/th/doodmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/doodmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/th/doodmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/doodmanga/res/mipmap-mdpi/ic_launcher.png b/src/th/doodmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/doodmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/th/doodmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/doodmanga/res/mipmap-xhdpi/ic_launcher.png b/src/th/doodmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/doodmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/th/doodmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/doodmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/th/doodmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/doodmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/th/doodmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/doodmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/th/doodmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/doodmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/th/doodmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/doodmanga/src/Doodmanga.kt b/src/th/doodmanga/src/eu/kanade/tachiyomi/extension/th/doodmanga/Doodmanga.kt
similarity index 100%
rename from multisrc/overrides/madara/doodmanga/src/Doodmanga.kt
rename to src/th/doodmanga/src/eu/kanade/tachiyomi/extension/th/doodmanga/Doodmanga.kt
diff --git a/multisrc/overrides/madara/doodmanga/src/ScrambledImageInterceptor.kt b/src/th/doodmanga/src/eu/kanade/tachiyomi/extension/th/doodmanga/ScrambledImageInterceptor.kt
similarity index 100%
rename from multisrc/overrides/madara/doodmanga/src/ScrambledImageInterceptor.kt
rename to src/th/doodmanga/src/eu/kanade/tachiyomi/extension/th/doodmanga/ScrambledImageInterceptor.kt
diff --git a/src/th/dragonmanga/build.gradle b/src/th/dragonmanga/build.gradle
new file mode 100644
index 000000000..7ab438a7b
--- /dev/null
+++ b/src/th/dragonmanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Dragon-Manga'
+ extClass = '.DragonManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://www.dragon-manga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/dragonmanga/src/DragonManga.kt b/src/th/dragonmanga/src/eu/kanade/tachiyomi/extension/th/dragonmanga/DragonManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/dragonmanga/src/DragonManga.kt
rename to src/th/dragonmanga/src/eu/kanade/tachiyomi/extension/th/dragonmanga/DragonManga.kt
diff --git a/src/th/kingsmanga/build.gradle b/src/th/kingsmanga/build.gradle
new file mode 100644
index 000000000..cb93bef91
--- /dev/null
+++ b/src/th/kingsmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Kings-Manga'
+ extClass = '.KingsManga'
+ themePkg = 'madara'
+ baseUrl = 'https://www.kings-manga.co'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/kingsmanga/res/mipmap-hdpi/ic_launcher.png b/src/th/kingsmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kingsmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/th/kingsmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kingsmanga/res/mipmap-mdpi/ic_launcher.png b/src/th/kingsmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kingsmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/th/kingsmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kingsmanga/res/mipmap-xhdpi/ic_launcher.png b/src/th/kingsmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kingsmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/th/kingsmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kingsmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/th/kingsmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kingsmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/th/kingsmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kingsmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/th/kingsmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/kingsmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/th/kingsmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/kingsmanga/src/KingsManga.kt b/src/th/kingsmanga/src/eu/kanade/tachiyomi/extension/th/kingsmanga/KingsManga.kt
similarity index 100%
rename from multisrc/overrides/madara/kingsmanga/src/KingsManga.kt
rename to src/th/kingsmanga/src/eu/kanade/tachiyomi/extension/th/kingsmanga/KingsManga.kt
diff --git a/src/th/lamimanga/build.gradle b/src/th/lamimanga/build.gradle
new file mode 100644
index 000000000..872848d67
--- /dev/null
+++ b/src/th/lamimanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Lami-Manga'
+ extClass = '.LamiManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://www.lami-manga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/lamimanga/res/mipmap-hdpi/ic_launcher.png b/src/th/lamimanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lamimanga/res/mipmap-hdpi/ic_launcher.png
rename to src/th/lamimanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lamimanga/res/mipmap-mdpi/ic_launcher.png b/src/th/lamimanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lamimanga/res/mipmap-mdpi/ic_launcher.png
rename to src/th/lamimanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lamimanga/res/mipmap-xhdpi/ic_launcher.png b/src/th/lamimanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lamimanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/th/lamimanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lamimanga/res/mipmap-xxhdpi/ic_launcher.png b/src/th/lamimanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lamimanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/th/lamimanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lamimanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/th/lamimanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/lamimanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/th/lamimanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/lamimanga/src/LamiManga.kt b/src/th/lamimanga/src/eu/kanade/tachiyomi/extension/th/lamimanga/LamiManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/lamimanga/src/LamiManga.kt
rename to src/th/lamimanga/src/eu/kanade/tachiyomi/extension/th/lamimanga/LamiManga.kt
diff --git a/src/th/makimaaaaa/build.gradle b/src/th/makimaaaaa/build.gradle
new file mode 100644
index 000000000..979156f89
--- /dev/null
+++ b/src/th/makimaaaaa/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Makimaaaaa'
+ extClass = '.Makimaaaaa'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://makimaaaaa.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/makimaaaaa/res/mipmap-hdpi/ic_launcher.png b/src/th/makimaaaaa/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/makimaaaaa/res/mipmap-hdpi/ic_launcher.png
rename to src/th/makimaaaaa/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/makimaaaaa/res/mipmap-mdpi/ic_launcher.png b/src/th/makimaaaaa/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/makimaaaaa/res/mipmap-mdpi/ic_launcher.png
rename to src/th/makimaaaaa/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/makimaaaaa/res/mipmap-xhdpi/ic_launcher.png b/src/th/makimaaaaa/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/makimaaaaa/res/mipmap-xhdpi/ic_launcher.png
rename to src/th/makimaaaaa/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/makimaaaaa/res/mipmap-xxhdpi/ic_launcher.png b/src/th/makimaaaaa/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/makimaaaaa/res/mipmap-xxhdpi/ic_launcher.png
rename to src/th/makimaaaaa/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/makimaaaaa/res/mipmap-xxxhdpi/ic_launcher.png b/src/th/makimaaaaa/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/makimaaaaa/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/th/makimaaaaa/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/makimaaaaa/src/Makimaaaaa.kt b/src/th/makimaaaaa/src/eu/kanade/tachiyomi/extension/th/makimaaaaa/Makimaaaaa.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/makimaaaaa/src/Makimaaaaa.kt
rename to src/th/makimaaaaa/src/eu/kanade/tachiyomi/extension/th/makimaaaaa/Makimaaaaa.kt
diff --git a/src/th/mangadeemak/build.gradle b/src/th/mangadeemak/build.gradle
new file mode 100644
index 000000000..3fafecd74
--- /dev/null
+++ b/src/th/mangadeemak/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaDeemak'
+ extClass = '.MangaDeemak'
+ themePkg = 'madara'
+ baseUrl = 'https://mangadeemak.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangadeemak/res/mipmap-hdpi/ic_launcher.png b/src/th/mangadeemak/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadeemak/res/mipmap-hdpi/ic_launcher.png
rename to src/th/mangadeemak/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadeemak/res/mipmap-mdpi/ic_launcher.png b/src/th/mangadeemak/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadeemak/res/mipmap-mdpi/ic_launcher.png
rename to src/th/mangadeemak/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadeemak/res/mipmap-xhdpi/ic_launcher.png b/src/th/mangadeemak/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadeemak/res/mipmap-xhdpi/ic_launcher.png
rename to src/th/mangadeemak/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadeemak/res/mipmap-xxhdpi/ic_launcher.png b/src/th/mangadeemak/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadeemak/res/mipmap-xxhdpi/ic_launcher.png
rename to src/th/mangadeemak/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadeemak/res/mipmap-xxxhdpi/ic_launcher.png b/src/th/mangadeemak/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadeemak/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/th/mangadeemak/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadeemak/src/MangaDeemak.kt b/src/th/mangadeemak/src/eu/kanade/tachiyomi/extension/th/mangadeemak/MangaDeemak.kt
similarity index 100%
rename from multisrc/overrides/madara/mangadeemak/src/MangaDeemak.kt
rename to src/th/mangadeemak/src/eu/kanade/tachiyomi/extension/th/mangadeemak/MangaDeemak.kt
diff --git a/src/th/mangamoon/build.gradle b/src/th/mangamoon/build.gradle
new file mode 100644
index 000000000..f2a47d6d4
--- /dev/null
+++ b/src/th/mangamoon/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga-Moon'
+ extClass = '.MangaMoon'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://manga-moons.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangamoon/src/MangaMoon.kt b/src/th/mangamoon/src/eu/kanade/tachiyomi/extension/th/mangamoon/MangaMoon.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangamoon/src/MangaMoon.kt
rename to src/th/mangamoon/src/eu/kanade/tachiyomi/extension/th/mangamoon/MangaMoon.kt
diff --git a/src/th/nekopostco/build.gradle b/src/th/nekopostco/build.gradle
new file mode 100644
index 000000000..46b89d9a7
--- /dev/null
+++ b/src/th/nekopostco/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'NekoPost.co (unoriginal)'
+ extClass = '.NekoPostCo'
+ themePkg = 'madara'
+ baseUrl = 'https://www.nekopost.co'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/nekopostco/res/mipmap-hdpi/ic_launcher.png b/src/th/nekopostco/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nekopostco/res/mipmap-hdpi/ic_launcher.png
rename to src/th/nekopostco/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nekopostco/res/mipmap-mdpi/ic_launcher.png b/src/th/nekopostco/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nekopostco/res/mipmap-mdpi/ic_launcher.png
rename to src/th/nekopostco/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nekopostco/res/mipmap-xhdpi/ic_launcher.png b/src/th/nekopostco/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nekopostco/res/mipmap-xhdpi/ic_launcher.png
rename to src/th/nekopostco/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nekopostco/res/mipmap-xxhdpi/ic_launcher.png b/src/th/nekopostco/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nekopostco/res/mipmap-xxhdpi/ic_launcher.png
rename to src/th/nekopostco/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nekopostco/res/mipmap-xxxhdpi/ic_launcher.png b/src/th/nekopostco/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/nekopostco/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/th/nekopostco/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/nekopostco/src/NekoPostCo.kt b/src/th/nekopostco/src/eu/kanade/tachiyomi/extension/th/nekopostco/NekoPostCo.kt
similarity index 100%
rename from multisrc/overrides/madara/nekopostco/src/NekoPostCo.kt
rename to src/th/nekopostco/src/eu/kanade/tachiyomi/extension/th/nekopostco/NekoPostCo.kt
diff --git a/src/th/ntrmanga/build.gradle b/src/th/ntrmanga/build.gradle
new file mode 100644
index 000000000..4a522298a
--- /dev/null
+++ b/src/th/ntrmanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'NTR-Manga'
+ extClass = '.NTRManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://www.ntr-manga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/ntrmanga/src/NTRManga.kt b/src/th/ntrmanga/src/eu/kanade/tachiyomi/extension/th/ntrmanga/NTRManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/ntrmanga/src/NTRManga.kt
rename to src/th/ntrmanga/src/eu/kanade/tachiyomi/extension/th/ntrmanga/NTRManga.kt
diff --git a/src/th/rh2plusmanga/build.gradle b/src/th/rh2plusmanga/build.gradle
new file mode 100644
index 000000000..e2f674344
--- /dev/null
+++ b/src/th/rh2plusmanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Rh2PlusManga'
+ extClass = '.Rh2PlusManga'
+ themePkg = 'madara'
+ baseUrl = 'https://www.rh2plusmanga.com'
+ overrideVersionCode = 5
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/rh2plusmanga/res/mipmap-hdpi/ic_launcher.png b/src/th/rh2plusmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rh2plusmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/th/rh2plusmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rh2plusmanga/res/mipmap-mdpi/ic_launcher.png b/src/th/rh2plusmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rh2plusmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/th/rh2plusmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rh2plusmanga/res/mipmap-xhdpi/ic_launcher.png b/src/th/rh2plusmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rh2plusmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/th/rh2plusmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rh2plusmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/th/rh2plusmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rh2plusmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/th/rh2plusmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rh2plusmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/th/rh2plusmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/rh2plusmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/th/rh2plusmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/rh2plusmanga/src/Rh2PlusManga.kt b/src/th/rh2plusmanga/src/eu/kanade/tachiyomi/extension/th/rh2plusmanga/Rh2PlusManga.kt
similarity index 100%
rename from multisrc/overrides/madara/rh2plusmanga/src/Rh2PlusManga.kt
rename to src/th/rh2plusmanga/src/eu/kanade/tachiyomi/extension/th/rh2plusmanga/Rh2PlusManga.kt
diff --git a/src/th/sodsaime/build.gradle b/src/th/sodsaime/build.gradle
new file mode 100644
index 000000000..467dfea03
--- /dev/null
+++ b/src/th/sodsaime/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Sodsaime'
+ extClass = '.Sodsaime'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://www.xn--l3c0azab5a2gta.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/sodsaime/res/mipmap-hdpi/ic_launcher.png b/src/th/sodsaime/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sodsaime/res/mipmap-hdpi/ic_launcher.png
rename to src/th/sodsaime/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sodsaime/res/mipmap-mdpi/ic_launcher.png b/src/th/sodsaime/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sodsaime/res/mipmap-mdpi/ic_launcher.png
rename to src/th/sodsaime/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sodsaime/res/mipmap-xhdpi/ic_launcher.png b/src/th/sodsaime/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sodsaime/res/mipmap-xhdpi/ic_launcher.png
rename to src/th/sodsaime/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sodsaime/res/mipmap-xxhdpi/ic_launcher.png b/src/th/sodsaime/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sodsaime/res/mipmap-xxhdpi/ic_launcher.png
rename to src/th/sodsaime/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sodsaime/res/mipmap-xxxhdpi/ic_launcher.png b/src/th/sodsaime/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/sodsaime/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/th/sodsaime/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/sodsaime/src/Sodsaime.kt b/src/th/sodsaime/src/eu/kanade/tachiyomi/extension/th/sodsaime/Sodsaime.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/sodsaime/src/Sodsaime.kt
rename to src/th/sodsaime/src/eu/kanade/tachiyomi/extension/th/sodsaime/Sodsaime.kt
diff --git a/src/tr/adonisfansub/build.gradle b/src/tr/adonisfansub/build.gradle
new file mode 100644
index 000000000..316221015
--- /dev/null
+++ b/src/tr/adonisfansub/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Adonis Fansub'
+ extClass = '.AdonisFansub'
+ themePkg = 'madara'
+ baseUrl = 'https://manga.adonisfansub.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/adonisfansub/res/mipmap-hdpi/ic_launcher.png b/src/tr/adonisfansub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/adonisfansub/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/adonisfansub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/adonisfansub/res/mipmap-mdpi/ic_launcher.png b/src/tr/adonisfansub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/adonisfansub/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/adonisfansub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/adonisfansub/res/mipmap-xhdpi/ic_launcher.png b/src/tr/adonisfansub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/adonisfansub/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/adonisfansub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/adonisfansub/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/adonisfansub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/adonisfansub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/adonisfansub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/adonisfansub/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/adonisfansub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/adonisfansub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/adonisfansub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/adonisfansub/src/AdonisFansub.kt b/src/tr/adonisfansub/src/eu/kanade/tachiyomi/extension/tr/adonisfansub/AdonisFansub.kt
similarity index 100%
rename from multisrc/overrides/madara/adonisfansub/src/AdonisFansub.kt
rename to src/tr/adonisfansub/src/eu/kanade/tachiyomi/extension/tr/adonisfansub/AdonisFansub.kt
diff --git a/src/tr/anikiga/build.gradle b/src/tr/anikiga/build.gradle
new file mode 100644
index 000000000..e6f74fe96
--- /dev/null
+++ b/src/tr/anikiga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Anikiga'
+ extClass = '.Anikiga'
+ themePkg = 'madara'
+ baseUrl = 'https://anikiga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/anikiga/res/mipmap-hdpi/ic_launcher.png b/src/tr/anikiga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anikiga/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/anikiga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anikiga/res/mipmap-mdpi/ic_launcher.png b/src/tr/anikiga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anikiga/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/anikiga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anikiga/res/mipmap-xhdpi/ic_launcher.png b/src/tr/anikiga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anikiga/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/anikiga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anikiga/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/anikiga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anikiga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/anikiga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anikiga/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/anikiga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anikiga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/anikiga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anikiga/src/Anikiga.kt b/src/tr/anikiga/src/eu/kanade/tachiyomi/extension/tr/anikiga/Anikiga.kt
similarity index 100%
rename from multisrc/overrides/madara/anikiga/src/Anikiga.kt
rename to src/tr/anikiga/src/eu/kanade/tachiyomi/extension/tr/anikiga/Anikiga.kt
diff --git a/src/tr/anisamanga/build.gradle b/src/tr/anisamanga/build.gradle
new file mode 100644
index 000000000..f9d48a8c2
--- /dev/null
+++ b/src/tr/anisamanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Anisa Manga'
+ extClass = '.AnisaManga'
+ themePkg = 'madara'
+ baseUrl = 'https://anisamanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/anisamanga/res/mipmap-hdpi/ic_launcher.png b/src/tr/anisamanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anisamanga/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/anisamanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anisamanga/res/mipmap-mdpi/ic_launcher.png b/src/tr/anisamanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anisamanga/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/anisamanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anisamanga/res/mipmap-xhdpi/ic_launcher.png b/src/tr/anisamanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anisamanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/anisamanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anisamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/anisamanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anisamanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/anisamanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/anisamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/anisamanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/anisamanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/anisamanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/tr/anisamanga/src/eu/kanade/tachiyomi/extension/tr/anisamanga/AnisaManga.kt b/src/tr/anisamanga/src/eu/kanade/tachiyomi/extension/tr/anisamanga/AnisaManga.kt
new file mode 100644
index 000000000..bb530f3e7
--- /dev/null
+++ b/src/tr/anisamanga/src/eu/kanade/tachiyomi/extension/tr/anisamanga/AnisaManga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.tr.anisamanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class AnisaManga : Madara("Anisa Manga", "https://anisamanga.com", "tr")
diff --git a/src/tr/araznovel/build.gradle b/src/tr/araznovel/build.gradle
new file mode 100644
index 000000000..cae1e6899
--- /dev/null
+++ b/src/tr/araznovel/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ArazNovel'
+ extClass = '.ArazNovel'
+ themePkg = 'madara'
+ baseUrl = 'https://www.araznovel.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/araznovel/res/mipmap-hdpi/ic_launcher.png b/src/tr/araznovel/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/araznovel/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/araznovel/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/araznovel/res/mipmap-mdpi/ic_launcher.png b/src/tr/araznovel/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/araznovel/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/araznovel/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/araznovel/res/mipmap-xhdpi/ic_launcher.png b/src/tr/araznovel/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/araznovel/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/araznovel/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/araznovel/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/araznovel/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/araznovel/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/araznovel/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/araznovel/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/araznovel/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/araznovel/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/araznovel/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/araznovel/src/ArazNovel.kt b/src/tr/araznovel/src/eu/kanade/tachiyomi/extension/tr/araznovel/ArazNovel.kt
similarity index 100%
rename from multisrc/overrides/madara/araznovel/src/ArazNovel.kt
rename to src/tr/araznovel/src/eu/kanade/tachiyomi/extension/tr/araznovel/ArazNovel.kt
diff --git a/src/tr/armoniscans/build.gradle b/src/tr/armoniscans/build.gradle
new file mode 100644
index 000000000..266653f72
--- /dev/null
+++ b/src/tr/armoniscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Armoni Scans'
+ extClass = '.ArmoniScans'
+ themePkg = 'madara'
+ baseUrl = 'https://armoniscans.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/armoniscans/res/mipmap-hdpi/ic_launcher.png b/src/tr/armoniscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/armoniscans/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/armoniscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/armoniscans/res/mipmap-mdpi/ic_launcher.png b/src/tr/armoniscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/armoniscans/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/armoniscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/armoniscans/res/mipmap-xhdpi/ic_launcher.png b/src/tr/armoniscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/armoniscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/armoniscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/armoniscans/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/armoniscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/armoniscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/armoniscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/armoniscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/armoniscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/armoniscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/armoniscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/tr/armoniscans/src/eu/kanade/tachiyomi/extension/tr/armoniscans/ArmoniScans.kt b/src/tr/armoniscans/src/eu/kanade/tachiyomi/extension/tr/armoniscans/ArmoniScans.kt
new file mode 100644
index 000000000..ee4d94f6a
--- /dev/null
+++ b/src/tr/armoniscans/src/eu/kanade/tachiyomi/extension/tr/armoniscans/ArmoniScans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.tr.armoniscans
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class ArmoniScans : Madara("Armoni Scans", "https://armoniscans.net", "tr")
diff --git a/src/tr/cizgiromanarsivi/build.gradle b/src/tr/cizgiromanarsivi/build.gradle
new file mode 100644
index 000000000..4ca9f83e5
--- /dev/null
+++ b/src/tr/cizgiromanarsivi/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Çizgi Roman Arşivi'
+ extClass = '.CizgiRomanArsivi'
+ themePkg = 'madara'
+ baseUrl = 'https://cizgiromanarsivi.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/cizgiromanarsivi/res/mipmap-hdpi/ic_launcher.png b/src/tr/cizgiromanarsivi/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cizgiromanarsivi/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/cizgiromanarsivi/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cizgiromanarsivi/res/mipmap-mdpi/ic_launcher.png b/src/tr/cizgiromanarsivi/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cizgiromanarsivi/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/cizgiromanarsivi/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cizgiromanarsivi/res/mipmap-xhdpi/ic_launcher.png b/src/tr/cizgiromanarsivi/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cizgiromanarsivi/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/cizgiromanarsivi/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cizgiromanarsivi/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/cizgiromanarsivi/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cizgiromanarsivi/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/cizgiromanarsivi/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/cizgiromanarsivi/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/cizgiromanarsivi/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/cizgiromanarsivi/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/cizgiromanarsivi/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/tr/cizgiromanarsivi/src/eu/kanade/tachiyomi/extension/tr/cizgiromanarsivi/CizgiRomanArsivi.kt b/src/tr/cizgiromanarsivi/src/eu/kanade/tachiyomi/extension/tr/cizgiromanarsivi/CizgiRomanArsivi.kt
new file mode 100644
index 000000000..610cdfbf1
--- /dev/null
+++ b/src/tr/cizgiromanarsivi/src/eu/kanade/tachiyomi/extension/tr/cizgiromanarsivi/CizgiRomanArsivi.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.tr.cizgiromanarsivi
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class CizgiRomanArsivi : Madara("Çizgi Roman Arşivi", "https://cizgiromanarsivi.com", "tr")
diff --git a/src/tr/clovermanga/build.gradle b/src/tr/clovermanga/build.gradle
new file mode 100644
index 000000000..26968a26d
--- /dev/null
+++ b/src/tr/clovermanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Clover Manga'
+ extClass = '.CloverManga'
+ themePkg = 'madara'
+ baseUrl = 'https://clover-manga.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/clovermanga/res/mipmap-hdpi/ic_launcher.png b/src/tr/clovermanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/clovermanga/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/clovermanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/clovermanga/res/mipmap-mdpi/ic_launcher.png b/src/tr/clovermanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/clovermanga/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/clovermanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/clovermanga/res/mipmap-xhdpi/ic_launcher.png b/src/tr/clovermanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/clovermanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/clovermanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/clovermanga/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/clovermanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/clovermanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/clovermanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/clovermanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/clovermanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/clovermanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/clovermanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/clovermanga/src/CloverManga.kt b/src/tr/clovermanga/src/eu/kanade/tachiyomi/extension/tr/clovermanga/CloverManga.kt
similarity index 100%
rename from multisrc/overrides/madara/clovermanga/src/CloverManga.kt
rename to src/tr/clovermanga/src/eu/kanade/tachiyomi/extension/tr/clovermanga/CloverManga.kt
diff --git a/src/tr/diamondfansub/build.gradle b/src/tr/diamondfansub/build.gradle
new file mode 100644
index 000000000..a38028daa
--- /dev/null
+++ b/src/tr/diamondfansub/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'DiamondFansub'
+ extClass = '.DiamondFansub'
+ themePkg = 'madara'
+ baseUrl = 'https://diamondfansub.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/diamondfansub/res/mipmap-hdpi/ic_launcher.png b/src/tr/diamondfansub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/diamondfansub/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/diamondfansub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/diamondfansub/res/mipmap-mdpi/ic_launcher.png b/src/tr/diamondfansub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/diamondfansub/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/diamondfansub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/diamondfansub/res/mipmap-xhdpi/ic_launcher.png b/src/tr/diamondfansub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/diamondfansub/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/diamondfansub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/diamondfansub/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/diamondfansub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/diamondfansub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/diamondfansub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/diamondfansub/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/diamondfansub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/diamondfansub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/diamondfansub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/diamondfansub/src/DiamondFansub.kt b/src/tr/diamondfansub/src/eu/kanade/tachiyomi/extension/tr/diamondfansub/DiamondFansub.kt
similarity index 100%
rename from multisrc/overrides/madara/diamondfansub/src/DiamondFansub.kt
rename to src/tr/diamondfansub/src/eu/kanade/tachiyomi/extension/tr/diamondfansub/DiamondFansub.kt
diff --git a/src/tr/esomanga/build.gradle b/src/tr/esomanga/build.gradle
new file mode 100644
index 000000000..f1e86c6c4
--- /dev/null
+++ b/src/tr/esomanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Esomanga'
+ extClass = '.Esomanga'
+ themePkg = 'madara'
+ baseUrl = 'https://esomanga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/esomanga/res/mipmap-hdpi/ic_launcher.png b/src/tr/esomanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/esomanga/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/esomanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/esomanga/res/mipmap-mdpi/ic_launcher.png b/src/tr/esomanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/esomanga/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/esomanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/esomanga/res/mipmap-xhdpi/ic_launcher.png b/src/tr/esomanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/esomanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/esomanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/esomanga/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/esomanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/esomanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/esomanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/esomanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/esomanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/esomanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/esomanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/tr/esomanga/src/eu/kanade/tachiyomi/extension/tr/esomanga/Esomanga.kt b/src/tr/esomanga/src/eu/kanade/tachiyomi/extension/tr/esomanga/Esomanga.kt
new file mode 100644
index 000000000..913bc1105
--- /dev/null
+++ b/src/tr/esomanga/src/eu/kanade/tachiyomi/extension/tr/esomanga/Esomanga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.tr.esomanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Esomanga : Madara("Esomanga", "https://esomanga.com", "tr")
diff --git a/src/tr/evascans/build.gradle b/src/tr/evascans/build.gradle
new file mode 100644
index 000000000..cd359fc72
--- /dev/null
+++ b/src/tr/evascans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'ManWe'
+ extClass = '.EvaScans'
+ themePkg = 'madara'
+ baseUrl = 'https://manwe.pro'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/evascans/res/mipmap-hdpi/ic_launcher.png b/src/tr/evascans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/evascans/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/evascans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/evascans/res/mipmap-mdpi/ic_launcher.png b/src/tr/evascans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/evascans/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/evascans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/evascans/res/mipmap-xhdpi/ic_launcher.png b/src/tr/evascans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/evascans/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/evascans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/evascans/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/evascans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/evascans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/evascans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/evascans/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/evascans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/evascans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/evascans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/evascans/src/EvaScans.kt b/src/tr/evascans/src/eu/kanade/tachiyomi/extension/tr/evascans/EvaScans.kt
similarity index 100%
rename from multisrc/overrides/madara/evascans/src/EvaScans.kt
rename to src/tr/evascans/src/eu/kanade/tachiyomi/extension/tr/evascans/EvaScans.kt
diff --git a/src/tr/glorymanga/build.gradle b/src/tr/glorymanga/build.gradle
new file mode 100644
index 000000000..2b9fb9976
--- /dev/null
+++ b/src/tr/glorymanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Glory Manga'
+ extClass = '.GloryManga'
+ themePkg = 'madara'
+ baseUrl = 'https://glorymanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/glorymanga/res/mipmap-hdpi/ic_launcher.png b/src/tr/glorymanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/glorymanga/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/glorymanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/glorymanga/res/mipmap-mdpi/ic_launcher.png b/src/tr/glorymanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/glorymanga/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/glorymanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/glorymanga/res/mipmap-xhdpi/ic_launcher.png b/src/tr/glorymanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/glorymanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/glorymanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/glorymanga/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/glorymanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/glorymanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/glorymanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/glorymanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/glorymanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/glorymanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/glorymanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/glorymanga/src/GloryManga.kt b/src/tr/glorymanga/src/eu/kanade/tachiyomi/extension/tr/glorymanga/GloryManga.kt
similarity index 100%
rename from multisrc/overrides/madara/glorymanga/src/GloryManga.kt
rename to src/tr/glorymanga/src/eu/kanade/tachiyomi/extension/tr/glorymanga/GloryManga.kt
diff --git a/src/tr/guncelmanga/build.gradle b/src/tr/guncelmanga/build.gradle
new file mode 100644
index 000000000..d5acda874
--- /dev/null
+++ b/src/tr/guncelmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'GuncelManga'
+ extClass = '.GuncelManga'
+ themePkg = 'madara'
+ baseUrl = 'https://guncelmanga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/guncelmanga/res/mipmap-hdpi/ic_launcher.png b/src/tr/guncelmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/guncelmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/guncelmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/guncelmanga/res/mipmap-mdpi/ic_launcher.png b/src/tr/guncelmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/guncelmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/guncelmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/guncelmanga/res/mipmap-xhdpi/ic_launcher.png b/src/tr/guncelmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/guncelmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/guncelmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/guncelmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/guncelmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/guncelmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/guncelmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/guncelmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/guncelmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/guncelmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/guncelmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/tr/guncelmanga/src/eu/kanade/tachiyomi/extension/tr/guncelmanga/GuncelManga.kt b/src/tr/guncelmanga/src/eu/kanade/tachiyomi/extension/tr/guncelmanga/GuncelManga.kt
new file mode 100644
index 000000000..1c0913aad
--- /dev/null
+++ b/src/tr/guncelmanga/src/eu/kanade/tachiyomi/extension/tr/guncelmanga/GuncelManga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.tr.guncelmanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class GuncelManga : Madara("GuncelManga", "https://guncelmanga.com", "tr")
diff --git a/src/tr/hattorimanga/build.gradle b/src/tr/hattorimanga/build.gradle
new file mode 100644
index 000000000..814fd9080
--- /dev/null
+++ b/src/tr/hattorimanga/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Hattori Manga'
+ extClass = '.HattoriManga'
+ themePkg = 'madara'
+ baseUrl = 'https://hattorimanga.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hattorimanga/res/mipmap-hdpi/ic_launcher.png b/src/tr/hattorimanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hattorimanga/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/hattorimanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hattorimanga/res/mipmap-mdpi/ic_launcher.png b/src/tr/hattorimanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hattorimanga/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/hattorimanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hattorimanga/res/mipmap-xhdpi/ic_launcher.png b/src/tr/hattorimanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hattorimanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/hattorimanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hattorimanga/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/hattorimanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hattorimanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/hattorimanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hattorimanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/hattorimanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hattorimanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/hattorimanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hattorimanga/src/HattoriManga.kt b/src/tr/hattorimanga/src/eu/kanade/tachiyomi/extension/tr/hattorimanga/HattoriManga.kt
similarity index 100%
rename from multisrc/overrides/madara/hattorimanga/src/HattoriManga.kt
rename to src/tr/hattorimanga/src/eu/kanade/tachiyomi/extension/tr/hattorimanga/HattoriManga.kt
diff --git a/src/tr/hayalistic/build.gradle b/src/tr/hayalistic/build.gradle
new file mode 100644
index 000000000..0af11ab1e
--- /dev/null
+++ b/src/tr/hayalistic/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Hayalistic'
+ extClass = '.Hayalistic'
+ themePkg = 'madara'
+ baseUrl = 'https://hayalistic.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hayalistic/res/mipmap-hdpi/ic_launcher.png b/src/tr/hayalistic/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hayalistic/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/hayalistic/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hayalistic/res/mipmap-mdpi/ic_launcher.png b/src/tr/hayalistic/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hayalistic/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/hayalistic/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hayalistic/res/mipmap-xhdpi/ic_launcher.png b/src/tr/hayalistic/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hayalistic/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/hayalistic/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hayalistic/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/hayalistic/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hayalistic/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/hayalistic/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hayalistic/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/hayalistic/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hayalistic/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/hayalistic/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/tr/hayalistic/src/eu/kanade/tachiyomi/extension/tr/hayalistic/Hayalistic.kt b/src/tr/hayalistic/src/eu/kanade/tachiyomi/extension/tr/hayalistic/Hayalistic.kt
new file mode 100644
index 000000000..8b19788e3
--- /dev/null
+++ b/src/tr/hayalistic/src/eu/kanade/tachiyomi/extension/tr/hayalistic/Hayalistic.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.tr.hayalistic
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Hayalistic : Madara("Hayalistic", "https://hayalistic.com", "tr")
diff --git a/src/tr/hentaizm/build.gradle b/src/tr/hentaizm/build.gradle
new file mode 100644
index 000000000..a2a5ee7b4
--- /dev/null
+++ b/src/tr/hentaizm/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HentaiZM'
+ extClass = '.HentaiZM'
+ themePkg = 'madara'
+ baseUrl = 'https://manga.hentaizm.fun'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentaizm/res/mipmap-hdpi/ic_launcher.png b/src/tr/hentaizm/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaizm/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/hentaizm/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaizm/res/mipmap-mdpi/ic_launcher.png b/src/tr/hentaizm/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaizm/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/hentaizm/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaizm/res/mipmap-xhdpi/ic_launcher.png b/src/tr/hentaizm/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaizm/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/hentaizm/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaizm/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/hentaizm/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaizm/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/hentaizm/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaizm/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/hentaizm/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaizm/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/hentaizm/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaizm/src/HentaiZM.kt b/src/tr/hentaizm/src/eu/kanade/tachiyomi/extension/tr/hentaizm/HentaiZM.kt
similarity index 100%
rename from multisrc/overrides/madara/hentaizm/src/HentaiZM.kt
rename to src/tr/hentaizm/src/eu/kanade/tachiyomi/extension/tr/hentaizm/HentaiZM.kt
diff --git a/src/tr/jiangzaitoon/build.gradle b/src/tr/jiangzaitoon/build.gradle
new file mode 100644
index 000000000..faf619448
--- /dev/null
+++ b/src/tr/jiangzaitoon/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Jiangzaitoon'
+ extClass = '.Jiangzaitoon'
+ themePkg = 'madara'
+ baseUrl = 'https://jiangzaitoon.info'
+ overrideVersionCode = 4
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/jiangzaitoon/res/mipmap-hdpi/ic_launcher.png b/src/tr/jiangzaitoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/jiangzaitoon/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/jiangzaitoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/jiangzaitoon/res/mipmap-mdpi/ic_launcher.png b/src/tr/jiangzaitoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/jiangzaitoon/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/jiangzaitoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/jiangzaitoon/res/mipmap-xhdpi/ic_launcher.png b/src/tr/jiangzaitoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/jiangzaitoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/jiangzaitoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/jiangzaitoon/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/jiangzaitoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/jiangzaitoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/jiangzaitoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/jiangzaitoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/jiangzaitoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/jiangzaitoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/jiangzaitoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/jiangzaitoon/src/Jiangzaitoon.kt b/src/tr/jiangzaitoon/src/eu/kanade/tachiyomi/extension/tr/jiangzaitoon/Jiangzaitoon.kt
similarity index 100%
rename from multisrc/overrides/madara/jiangzaitoon/src/Jiangzaitoon.kt
rename to src/tr/jiangzaitoon/src/eu/kanade/tachiyomi/extension/tr/jiangzaitoon/Jiangzaitoon.kt
diff --git a/src/tr/mangacim/build.gradle b/src/tr/mangacim/build.gradle
new file mode 100644
index 000000000..c281c1555
--- /dev/null
+++ b/src/tr/mangacim/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Mangacim'
+ extClass = '.Mangacim'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://www.mangacim.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangacim/res/mipmap-hdpi/ic_launcher.png b/src/tr/mangacim/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangacim/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/mangacim/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangacim/res/mipmap-mdpi/ic_launcher.png b/src/tr/mangacim/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangacim/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/mangacim/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangacim/res/mipmap-xhdpi/ic_launcher.png b/src/tr/mangacim/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangacim/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/mangacim/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangacim/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/mangacim/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangacim/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/mangacim/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangacim/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/mangacim/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangacim/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/mangacim/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangacim/src/Mangacim.kt b/src/tr/mangacim/src/eu/kanade/tachiyomi/extension/tr/mangacim/Mangacim.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangacim/src/Mangacim.kt
rename to src/tr/mangacim/src/eu/kanade/tachiyomi/extension/tr/mangacim/Mangacim.kt
diff --git a/src/tr/mangadiyari/build.gradle b/src/tr/mangadiyari/build.gradle
new file mode 100644
index 000000000..716d03c7d
--- /dev/null
+++ b/src/tr/mangadiyari/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Diyari'
+ extClass = '.MangaDiyari'
+ themePkg = 'madara'
+ baseUrl = 'https://manga-diyari.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangadiyari/res/mipmap-hdpi/ic_launcher.png b/src/tr/mangadiyari/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadiyari/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/mangadiyari/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadiyari/res/mipmap-mdpi/ic_launcher.png b/src/tr/mangadiyari/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadiyari/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/mangadiyari/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadiyari/res/mipmap-xhdpi/ic_launcher.png b/src/tr/mangadiyari/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadiyari/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/mangadiyari/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadiyari/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/mangadiyari/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadiyari/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/mangadiyari/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadiyari/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/mangadiyari/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangadiyari/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/mangadiyari/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangadiyari/src/MangaDiyari.kt b/src/tr/mangadiyari/src/eu/kanade/tachiyomi/extension/tr/mangadiyari/MangaDiyari.kt
similarity index 100%
rename from multisrc/overrides/madara/mangadiyari/src/MangaDiyari.kt
rename to src/tr/mangadiyari/src/eu/kanade/tachiyomi/extension/tr/mangadiyari/MangaDiyari.kt
diff --git a/src/tr/mangaefendisi/build.gradle b/src/tr/mangaefendisi/build.gradle
new file mode 100644
index 000000000..fe0223a37
--- /dev/null
+++ b/src/tr/mangaefendisi/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Efendisi'
+ extClass = '.MangaEfendisi'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangaefendisi.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangaefendisi/res/mipmap-hdpi/ic_launcher.png b/src/tr/mangaefendisi/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaefendisi/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/mangaefendisi/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaefendisi/res/mipmap-mdpi/ic_launcher.png b/src/tr/mangaefendisi/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaefendisi/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/mangaefendisi/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaefendisi/res/mipmap-xhdpi/ic_launcher.png b/src/tr/mangaefendisi/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaefendisi/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/mangaefendisi/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaefendisi/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/mangaefendisi/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaefendisi/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/mangaefendisi/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaefendisi/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/mangaefendisi/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaefendisi/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/mangaefendisi/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangaefendisi/src/MangaEfendisi.kt b/src/tr/mangaefendisi/src/eu/kanade/tachiyomi/extension/tr/mangaefendisi/MangaEfendisi.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangaefendisi/src/MangaEfendisi.kt
rename to src/tr/mangaefendisi/src/eu/kanade/tachiyomi/extension/tr/mangaefendisi/MangaEfendisi.kt
diff --git a/src/tr/mangagezgini/build.gradle b/src/tr/mangagezgini/build.gradle
new file mode 100644
index 000000000..63ed8cc5d
--- /dev/null
+++ b/src/tr/mangagezgini/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaGezgini'
+ extClass = '.MangaGezgini'
+ themePkg = 'madara'
+ baseUrl = 'https://mangagezgini.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangagezgini/res/mipmap-hdpi/ic_launcher.png b/src/tr/mangagezgini/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagezgini/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/mangagezgini/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagezgini/res/mipmap-mdpi/ic_launcher.png b/src/tr/mangagezgini/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagezgini/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/mangagezgini/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagezgini/res/mipmap-xhdpi/ic_launcher.png b/src/tr/mangagezgini/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagezgini/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/mangagezgini/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagezgini/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/mangagezgini/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagezgini/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/mangagezgini/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagezgini/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/mangagezgini/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangagezgini/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/mangagezgini/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangagezgini/src/MangaGezgini.kt b/src/tr/mangagezgini/src/eu/kanade/tachiyomi/extension/tr/mangagezgini/MangaGezgini.kt
similarity index 100%
rename from multisrc/overrides/madara/mangagezgini/src/MangaGezgini.kt
rename to src/tr/mangagezgini/src/eu/kanade/tachiyomi/extension/tr/mangagezgini/MangaGezgini.kt
diff --git a/src/tr/mangakeyfi/build.gradle b/src/tr/mangakeyfi/build.gradle
new file mode 100644
index 000000000..a112cfeb4
--- /dev/null
+++ b/src/tr/mangakeyfi/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Keyfi'
+ extClass = '.MangaKeyfi'
+ themePkg = 'madara'
+ baseUrl = 'https://mangakeyfi.net'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangakeyfi/res/mipmap-hdpi/ic_launcher.png b/src/tr/mangakeyfi/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakeyfi/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/mangakeyfi/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakeyfi/res/mipmap-mdpi/ic_launcher.png b/src/tr/mangakeyfi/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakeyfi/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/mangakeyfi/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakeyfi/res/mipmap-xhdpi/ic_launcher.png b/src/tr/mangakeyfi/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakeyfi/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/mangakeyfi/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakeyfi/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/mangakeyfi/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakeyfi/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/mangakeyfi/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakeyfi/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/mangakeyfi/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangakeyfi/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/mangakeyfi/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangakeyfi/src/MangaKeyfi.kt b/src/tr/mangakeyfi/src/eu/kanade/tachiyomi/extension/tr/mangakeyfi/MangaKeyfi.kt
similarity index 100%
rename from multisrc/overrides/madara/mangakeyfi/src/MangaKeyfi.kt
rename to src/tr/mangakeyfi/src/eu/kanade/tachiyomi/extension/tr/mangakeyfi/MangaKeyfi.kt
diff --git a/src/tr/mangakings/build.gradle b/src/tr/mangakings/build.gradle
new file mode 100644
index 000000000..89652acf6
--- /dev/null
+++ b/src/tr/mangakings/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga Kings'
+ extClass = '.MangaKings'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangakings.com.tr'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangakings/res/mipmap-hdpi/ic_launcher.png b/src/tr/mangakings/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakings/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/mangakings/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakings/res/mipmap-mdpi/ic_launcher.png b/src/tr/mangakings/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakings/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/mangakings/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakings/res/mipmap-xhdpi/ic_launcher.png b/src/tr/mangakings/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakings/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/mangakings/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakings/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/mangakings/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakings/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/mangakings/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakings/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/mangakings/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakings/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/mangakings/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangakings/src/MangaKings.kt b/src/tr/mangakings/src/eu/kanade/tachiyomi/extension/tr/mangakings/MangaKings.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangakings/src/MangaKings.kt
rename to src/tr/mangakings/src/eu/kanade/tachiyomi/extension/tr/mangakings/MangaKings.kt
diff --git a/src/tr/mangasehri/build.gradle b/src/tr/mangasehri/build.gradle
new file mode 100644
index 000000000..503d06136
--- /dev/null
+++ b/src/tr/mangasehri/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Manga Şehri'
+ extClass = '.MangaSehri'
+ themePkg = 'madara'
+ baseUrl = 'https://manga-sehri.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangasehri/res/mipmap-hdpi/ic_launcher.png b/src/tr/mangasehri/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasehri/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/mangasehri/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasehri/res/mipmap-mdpi/ic_launcher.png b/src/tr/mangasehri/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasehri/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/mangasehri/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasehri/res/mipmap-xhdpi/ic_launcher.png b/src/tr/mangasehri/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasehri/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/mangasehri/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasehri/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/mangasehri/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasehri/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/mangasehri/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasehri/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/mangasehri/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangasehri/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/mangasehri/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangasehri/src/MangaSehri.kt b/src/tr/mangasehri/src/eu/kanade/tachiyomi/extension/tr/mangasehri/MangaSehri.kt
similarity index 100%
rename from multisrc/overrides/madara/mangasehri/src/MangaSehri.kt
rename to src/tr/mangasehri/src/eu/kanade/tachiyomi/extension/tr/mangasehri/MangaSehri.kt
diff --git a/src/tr/mangatr/build.gradle b/src/tr/mangatr/build.gradle
new file mode 100644
index 000000000..af8837c79
--- /dev/null
+++ b/src/tr/mangatr/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Manga-TR'
+ extClass = '.MangaTR'
+ themePkg = 'fmreader'
+ baseUrl = 'https://manga-tr.com'
+ overrideVersionCode = 3
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/fmreader/mangatr/res/mipmap-hdpi/ic_launcher.png b/src/tr/mangatr/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/mangatr/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/mangatr/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/mangatr/res/mipmap-mdpi/ic_launcher.png b/src/tr/mangatr/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/mangatr/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/mangatr/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/mangatr/res/mipmap-xhdpi/ic_launcher.png b/src/tr/mangatr/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/mangatr/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/mangatr/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/mangatr/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/mangatr/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/mangatr/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/mangatr/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/mangatr/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/mangatr/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/fmreader/mangatr/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/mangatr/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/fmreader/mangatr/src/DDoSGuardInterceptor.kt b/src/tr/mangatr/src/eu/kanade/tachiyomi/extension/tr/mangatr/DDoSGuardInterceptor.kt
similarity index 100%
rename from multisrc/overrides/fmreader/mangatr/src/DDoSGuardInterceptor.kt
rename to src/tr/mangatr/src/eu/kanade/tachiyomi/extension/tr/mangatr/DDoSGuardInterceptor.kt
diff --git a/multisrc/overrides/fmreader/mangatr/src/MangaTR.kt b/src/tr/mangatr/src/eu/kanade/tachiyomi/extension/tr/mangatr/MangaTR.kt
similarity index 100%
rename from multisrc/overrides/fmreader/mangatr/src/MangaTR.kt
rename to src/tr/mangatr/src/eu/kanade/tachiyomi/extension/tr/mangatr/MangaTR.kt
diff --git a/src/tr/mangawow/build.gradle b/src/tr/mangawow/build.gradle
new file mode 100644
index 000000000..ad047b416
--- /dev/null
+++ b/src/tr/mangawow/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaWOW'
+ extClass = '.MangaWOW'
+ themePkg = 'madara'
+ baseUrl = 'https://mangawow.org'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/mangawow/res/mipmap-hdpi/ic_launcher.png b/src/tr/mangawow/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangawow/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/mangawow/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangawow/res/mipmap-mdpi/ic_launcher.png b/src/tr/mangawow/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangawow/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/mangawow/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangawow/res/mipmap-xhdpi/ic_launcher.png b/src/tr/mangawow/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangawow/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/mangawow/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangawow/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/mangawow/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangawow/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/mangawow/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangawow/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/mangawow/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/mangawow/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/mangawow/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/mangawow/src/MangaWOW.kt b/src/tr/mangawow/src/eu/kanade/tachiyomi/extension/tr/mangawow/MangaWOW.kt
similarity index 100%
rename from multisrc/overrides/madara/mangawow/src/MangaWOW.kt
rename to src/tr/mangawow/src/eu/kanade/tachiyomi/extension/tr/mangawow/MangaWOW.kt
diff --git a/src/tr/mangawt/build.gradle b/src/tr/mangawt/build.gradle
new file mode 100644
index 000000000..5a2d8d978
--- /dev/null
+++ b/src/tr/mangawt/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'MangaWT'
+ extClass = '.MangaWT'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://mangawt.com'
+ overrideVersionCode = 5
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/mangawt/res/mipmap-hdpi/ic_launcher.png b/src/tr/mangawt/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangawt/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/mangawt/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangawt/res/mipmap-mdpi/ic_launcher.png b/src/tr/mangawt/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangawt/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/mangawt/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangawt/res/mipmap-xhdpi/ic_launcher.png b/src/tr/mangawt/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangawt/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/mangawt/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangawt/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/mangawt/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangawt/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/mangawt/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangawt/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/mangawt/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangawt/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/mangawt/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/mangawt/src/MangaWT.kt b/src/tr/mangawt/src/eu/kanade/tachiyomi/extension/tr/mangawt/MangaWT.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/mangawt/src/MangaWT.kt
rename to src/tr/mangawt/src/eu/kanade/tachiyomi/extension/tr/mangawt/MangaWT.kt
diff --git a/src/tr/mikrokosmosfansub/build.gradle b/src/tr/mikrokosmosfansub/build.gradle
new file mode 100644
index 000000000..757b4af35
--- /dev/null
+++ b/src/tr/mikrokosmosfansub/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Mikrokosmos Fansub'
+ extClass = '.MikrokosmosFansub'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://mikrokosmosfb.blogspot.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/mikrokosmosfansub/res/mipmap-hdpi/ic_launcher.png b/src/tr/mikrokosmosfansub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mikrokosmosfansub/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/mikrokosmosfansub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mikrokosmosfansub/res/mipmap-mdpi/ic_launcher.png b/src/tr/mikrokosmosfansub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mikrokosmosfansub/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/mikrokosmosfansub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mikrokosmosfansub/res/mipmap-xhdpi/ic_launcher.png b/src/tr/mikrokosmosfansub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mikrokosmosfansub/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/mikrokosmosfansub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mikrokosmosfansub/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/mikrokosmosfansub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mikrokosmosfansub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/mikrokosmosfansub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mikrokosmosfansub/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/mikrokosmosfansub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/mikrokosmosfansub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/mikrokosmosfansub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/mikrokosmosfansub/src/MikrokosmosFansub.kt b/src/tr/mikrokosmosfansub/src/eu/kanade/tachiyomi/extension/tr/mikrokosmosfansub/MikrokosmosFansub.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/mikrokosmosfansub/src/MikrokosmosFansub.kt
rename to src/tr/mikrokosmosfansub/src/eu/kanade/tachiyomi/extension/tr/mikrokosmosfansub/MikrokosmosFansub.kt
diff --git a/src/tr/nirvanamanga/build.gradle b/src/tr/nirvanamanga/build.gradle
new file mode 100644
index 000000000..aaa61c30c
--- /dev/null
+++ b/src/tr/nirvanamanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Nirvana Manga'
+ extClass = '.NirvanaManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://nirvanamanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/nirvanamanga/res/mipmap-hdpi/ic_launcher.png b/src/tr/nirvanamanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nirvanamanga/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/nirvanamanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nirvanamanga/res/mipmap-mdpi/ic_launcher.png b/src/tr/nirvanamanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nirvanamanga/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/nirvanamanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nirvanamanga/res/mipmap-xhdpi/ic_launcher.png b/src/tr/nirvanamanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nirvanamanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/nirvanamanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nirvanamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/nirvanamanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nirvanamanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/nirvanamanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nirvanamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/nirvanamanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/nirvanamanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/nirvanamanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/nirvanamanga/src/NirvanaManga.kt b/src/tr/nirvanamanga/src/eu/kanade/tachiyomi/extension/tr/nirvanamanga/NirvanaManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/nirvanamanga/src/NirvanaManga.kt
rename to src/tr/nirvanamanga/src/eu/kanade/tachiyomi/extension/tr/nirvanamanga/NirvanaManga.kt
diff --git a/src/tr/romantikmanga/build.gradle b/src/tr/romantikmanga/build.gradle
new file mode 100644
index 000000000..c87d3fc99
--- /dev/null
+++ b/src/tr/romantikmanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Romantik Manga'
+ extClass = '.RomantikManga'
+ themePkg = 'madara'
+ baseUrl = 'https://romantikmanga.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/romantikmanga/res/mipmap-hdpi/ic_launcher.png b/src/tr/romantikmanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/romantikmanga/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/romantikmanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/romantikmanga/res/mipmap-mdpi/ic_launcher.png b/src/tr/romantikmanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/romantikmanga/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/romantikmanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/romantikmanga/res/mipmap-xhdpi/ic_launcher.png b/src/tr/romantikmanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/romantikmanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/romantikmanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/romantikmanga/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/romantikmanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/romantikmanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/romantikmanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/romantikmanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/romantikmanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/romantikmanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/romantikmanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/romantikmanga/src/RomantikManga.kt b/src/tr/romantikmanga/src/eu/kanade/tachiyomi/extension/tr/romantikmanga/RomantikManga.kt
similarity index 100%
rename from multisrc/overrides/madara/romantikmanga/src/RomantikManga.kt
rename to src/tr/romantikmanga/src/eu/kanade/tachiyomi/extension/tr/romantikmanga/RomantikManga.kt
diff --git a/src/tr/ruyamanga/build.gradle b/src/tr/ruyamanga/build.gradle
new file mode 100644
index 000000000..e2fa2f1b6
--- /dev/null
+++ b/src/tr/ruyamanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Rüya Manga'
+ extClass = '.RuyaManga'
+ themePkg = 'madara'
+ baseUrl = 'https://www.ruyamanga.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/ruyamanga/res/mipmap-hdpi/ic_launcher.png b/src/tr/ruyamanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ruyamanga/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/ruyamanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ruyamanga/res/mipmap-mdpi/ic_launcher.png b/src/tr/ruyamanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ruyamanga/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/ruyamanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ruyamanga/res/mipmap-xhdpi/ic_launcher.png b/src/tr/ruyamanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ruyamanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/ruyamanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ruyamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/ruyamanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ruyamanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/ruyamanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ruyamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/ruyamanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/ruyamanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/ruyamanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/ruyamanga/src/RuyaManga.kt b/src/tr/ruyamanga/src/eu/kanade/tachiyomi/extension/tr/ruyamanga/RuyaManga.kt
similarity index 100%
rename from multisrc/overrides/madara/ruyamanga/src/RuyaManga.kt
rename to src/tr/ruyamanga/src/eu/kanade/tachiyomi/extension/tr/ruyamanga/RuyaManga.kt
diff --git a/src/tr/sadscans/build.gradle b/src/tr/sadscans/build.gradle
new file mode 100644
index 000000000..941a3e02d
--- /dev/null
+++ b/src/tr/sadscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Sadscans'
+ extClass = '.Sadscans'
+ themePkg = 'po2scans'
+ baseUrl = 'https://sadscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/po2scans/sadscans/res/mipmap-hdpi/ic_launcher.png b/src/tr/sadscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/po2scans/sadscans/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/sadscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/po2scans/sadscans/res/mipmap-mdpi/ic_launcher.png b/src/tr/sadscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/po2scans/sadscans/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/sadscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/po2scans/sadscans/res/mipmap-xhdpi/ic_launcher.png b/src/tr/sadscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/po2scans/sadscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/sadscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/po2scans/sadscans/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/sadscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/po2scans/sadscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/sadscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/po2scans/sadscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/sadscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/po2scans/sadscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/sadscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/tr/sadscans/src/eu/kanade/tachiyomi/extension/tr/sadscans/Sadscans.kt b/src/tr/sadscans/src/eu/kanade/tachiyomi/extension/tr/sadscans/Sadscans.kt
new file mode 100644
index 000000000..773e94b8b
--- /dev/null
+++ b/src/tr/sadscans/src/eu/kanade/tachiyomi/extension/tr/sadscans/Sadscans.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.tr.sadscans
+
+import eu.kanade.tachiyomi.multisrc.po2scans.PO2Scans
+
+class Sadscans : PO2Scans("Sadscans", "https://sadscans.com", "tr")
diff --git a/src/tr/shadowceviri/build.gradle b/src/tr/shadowceviri/build.gradle
new file mode 100644
index 000000000..9af3c0d96
--- /dev/null
+++ b/src/tr/shadowceviri/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Shadow Çeviri'
+ extClass = '.ShadowCeviri'
+ themePkg = 'zeistmanga'
+ baseUrl = 'https://shadowceviri.blogspot.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/zeistmanga/shadowceviri/res/mipmap-hdpi/ic_launcher.png b/src/tr/shadowceviri/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/shadowceviri/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/shadowceviri/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/shadowceviri/res/mipmap-mdpi/ic_launcher.png b/src/tr/shadowceviri/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/shadowceviri/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/shadowceviri/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/shadowceviri/res/mipmap-xhdpi/ic_launcher.png b/src/tr/shadowceviri/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/shadowceviri/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/shadowceviri/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/shadowceviri/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/shadowceviri/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/shadowceviri/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/shadowceviri/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/shadowceviri/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/shadowceviri/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/zeistmanga/shadowceviri/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/shadowceviri/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/zeistmanga/shadowceviri/src/ShadowCeviri.kt b/src/tr/shadowceviri/src/eu/kanade/tachiyomi/extension/tr/shadowceviri/ShadowCeviri.kt
similarity index 100%
rename from multisrc/overrides/zeistmanga/shadowceviri/src/ShadowCeviri.kt
rename to src/tr/shadowceviri/src/eu/kanade/tachiyomi/extension/tr/shadowceviri/ShadowCeviri.kt
diff --git a/src/tr/siyahmelek/build.gradle b/src/tr/siyahmelek/build.gradle
new file mode 100644
index 000000000..01f12f4fe
--- /dev/null
+++ b/src/tr/siyahmelek/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Gri Melek'
+ extClass = '.Siyahmelek'
+ themePkg = 'madara'
+ baseUrl = 'https://grimelek.net'
+ overrideVersionCode = 4
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/siyahmelek/res/mipmap-hdpi/ic_launcher.png b/src/tr/siyahmelek/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/siyahmelek/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/siyahmelek/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/siyahmelek/res/mipmap-mdpi/ic_launcher.png b/src/tr/siyahmelek/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/siyahmelek/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/siyahmelek/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/siyahmelek/res/mipmap-xhdpi/ic_launcher.png b/src/tr/siyahmelek/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/siyahmelek/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/siyahmelek/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/siyahmelek/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/siyahmelek/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/siyahmelek/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/siyahmelek/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/siyahmelek/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/siyahmelek/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/siyahmelek/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/siyahmelek/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt b/src/tr/siyahmelek/src/eu/kanade/tachiyomi/extension/tr/siyahmelek/Siyahmelek.kt
similarity index 100%
rename from multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt
rename to src/tr/siyahmelek/src/eu/kanade/tachiyomi/extension/tr/siyahmelek/Siyahmelek.kt
diff --git a/src/tr/summertoon/build.gradle b/src/tr/summertoon/build.gradle
new file mode 100644
index 000000000..eff7424aa
--- /dev/null
+++ b/src/tr/summertoon/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'SummerToon'
+ extClass = '.SummerToon'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://summertoon.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/summertoon/res/mipmap-hdpi/ic_launcher.png b/src/tr/summertoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/summertoon/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/summertoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/summertoon/res/mipmap-mdpi/ic_launcher.png b/src/tr/summertoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/summertoon/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/summertoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/summertoon/res/mipmap-xhdpi/ic_launcher.png b/src/tr/summertoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/summertoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/summertoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/summertoon/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/summertoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/summertoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/summertoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/summertoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/summertoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/summertoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/summertoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/summertoon/src/SummerToon.kt b/src/tr/summertoon/src/eu/kanade/tachiyomi/extension/tr/summertoon/SummerToon.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/summertoon/src/SummerToon.kt
rename to src/tr/summertoon/src/eu/kanade/tachiyomi/extension/tr/summertoon/SummerToon.kt
diff --git a/src/tr/tarotscans/build.gradle b/src/tr/tarotscans/build.gradle
new file mode 100644
index 000000000..fd3f39563
--- /dev/null
+++ b/src/tr/tarotscans/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Tarot Scans'
+ extClass = '.TarotScans'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://www.tarotscans.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/tarotscans/res/mipmap-hdpi/ic_launcher.png b/src/tr/tarotscans/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tarotscans/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/tarotscans/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tarotscans/res/mipmap-mdpi/ic_launcher.png b/src/tr/tarotscans/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tarotscans/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/tarotscans/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tarotscans/res/mipmap-xhdpi/ic_launcher.png b/src/tr/tarotscans/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tarotscans/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/tarotscans/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tarotscans/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/tarotscans/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tarotscans/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/tarotscans/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tarotscans/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/tarotscans/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tarotscans/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/tarotscans/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tarotscans/src/TarotScans.kt b/src/tr/tarotscans/src/eu/kanade/tachiyomi/extension/tr/tarotscans/TarotScans.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/tarotscans/src/TarotScans.kt
rename to src/tr/tarotscans/src/eu/kanade/tachiyomi/extension/tr/tarotscans/TarotScans.kt
diff --git a/src/tr/tempestfansub/build.gradle b/src/tr/tempestfansub/build.gradle
new file mode 100644
index 000000000..1ef5b52d9
--- /dev/null
+++ b/src/tr/tempestfansub/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Tempest Fansub'
+ extClass = '.TempestFansub'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://tempestfansub.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/tempestfansub/res/mipmap-hdpi/ic_launcher.png b/src/tr/tempestfansub/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tempestfansub/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/tempestfansub/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tempestfansub/res/mipmap-mdpi/ic_launcher.png b/src/tr/tempestfansub/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tempestfansub/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/tempestfansub/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tempestfansub/res/mipmap-xhdpi/ic_launcher.png b/src/tr/tempestfansub/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tempestfansub/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/tempestfansub/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tempestfansub/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/tempestfansub/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tempestfansub/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/tempestfansub/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tempestfansub/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/tempestfansub/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/tempestfansub/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/tempestfansub/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/tempestfansub/src/TempestFansub.kt b/src/tr/tempestfansub/src/eu/kanade/tachiyomi/extension/tr/tempestfansub/TempestFansub.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/tempestfansub/src/TempestFansub.kt
rename to src/tr/tempestfansub/src/eu/kanade/tachiyomi/extension/tr/tempestfansub/TempestFansub.kt
diff --git a/src/tr/timenaight/build.gradle b/src/tr/timenaight/build.gradle
new file mode 100644
index 000000000..8993ecaad
--- /dev/null
+++ b/src/tr/timenaight/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Time Naight'
+ extClass = '.TimeNaight'
+ themePkg = 'madara'
+ baseUrl = 'https://timenaight.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/timenaight/res/mipmap-hdpi/ic_launcher.png b/src/tr/timenaight/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/timenaight/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/timenaight/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/timenaight/res/mipmap-mdpi/ic_launcher.png b/src/tr/timenaight/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/timenaight/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/timenaight/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/timenaight/res/mipmap-xhdpi/ic_launcher.png b/src/tr/timenaight/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/timenaight/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/timenaight/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/timenaight/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/timenaight/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/timenaight/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/timenaight/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/timenaight/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/timenaight/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/timenaight/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/timenaight/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/tr/timenaight/src/eu/kanade/tachiyomi/extension/tr/timenaight/TimeNaight.kt b/src/tr/timenaight/src/eu/kanade/tachiyomi/extension/tr/timenaight/TimeNaight.kt
new file mode 100644
index 000000000..5cda34c2a
--- /dev/null
+++ b/src/tr/timenaight/src/eu/kanade/tachiyomi/extension/tr/timenaight/TimeNaight.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.tr.timenaight
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class TimeNaight : Madara("Time Naight", "https://timenaight.com", "tr")
diff --git a/src/tr/tonizutoon/build.gradle b/src/tr/tonizutoon/build.gradle
new file mode 100644
index 000000000..9b87ec409
--- /dev/null
+++ b/src/tr/tonizutoon/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'TonizuToon'
+ extClass = '.TonizuToon'
+ themePkg = 'madara'
+ baseUrl = 'https://tonizu.com'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/tonizutoon/res/mipmap-hdpi/ic_launcher.png b/src/tr/tonizutoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tonizutoon/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/tonizutoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tonizutoon/res/mipmap-mdpi/ic_launcher.png b/src/tr/tonizutoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tonizutoon/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/tonizutoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tonizutoon/res/mipmap-xhdpi/ic_launcher.png b/src/tr/tonizutoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tonizutoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/tonizutoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tonizutoon/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/tonizutoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tonizutoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/tonizutoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tonizutoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/tonizutoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tonizutoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/tonizutoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tonizutoon/src/TonizuToon.kt b/src/tr/tonizutoon/src/eu/kanade/tachiyomi/extension/tr/tonizutoon/TonizuToon.kt
similarity index 100%
rename from multisrc/overrides/madara/tonizutoon/src/TonizuToon.kt
rename to src/tr/tonizutoon/src/eu/kanade/tachiyomi/extension/tr/tonizutoon/TonizuToon.kt
diff --git a/src/tr/tortugaceviri/build.gradle b/src/tr/tortugaceviri/build.gradle
new file mode 100644
index 000000000..2fea48173
--- /dev/null
+++ b/src/tr/tortugaceviri/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Tortuga Ceviri'
+ extClass = '.TortugaCeviri'
+ themePkg = 'madara'
+ baseUrl = 'https://tortuga-ceviri.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/tortugaceviri/res/mipmap-hdpi/ic_launcher.png b/src/tr/tortugaceviri/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tortugaceviri/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/tortugaceviri/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tortugaceviri/res/mipmap-mdpi/ic_launcher.png b/src/tr/tortugaceviri/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tortugaceviri/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/tortugaceviri/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tortugaceviri/res/mipmap-xhdpi/ic_launcher.png b/src/tr/tortugaceviri/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tortugaceviri/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/tortugaceviri/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tortugaceviri/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/tortugaceviri/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tortugaceviri/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/tortugaceviri/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tortugaceviri/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/tortugaceviri/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/tortugaceviri/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/tortugaceviri/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/tortugaceviri/src/TortugaCeviri.kt b/src/tr/tortugaceviri/src/eu/kanade/tachiyomi/extension/tr/tortugaceviri/TortugaCeviri.kt
similarity index 100%
rename from multisrc/overrides/madara/tortugaceviri/src/TortugaCeviri.kt
rename to src/tr/tortugaceviri/src/eu/kanade/tachiyomi/extension/tr/tortugaceviri/TortugaCeviri.kt
diff --git a/src/tr/turktoon/build.gradle b/src/tr/turktoon/build.gradle
new file mode 100644
index 000000000..5f25a6ed3
--- /dev/null
+++ b/src/tr/turktoon/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'TurkToon'
+ extClass = '.TurkToon'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://turktoon.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/turktoon/res/mipmap-hdpi/ic_launcher.png b/src/tr/turktoon/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/turktoon/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/turktoon/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/turktoon/res/mipmap-mdpi/ic_launcher.png b/src/tr/turktoon/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/turktoon/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/turktoon/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/turktoon/res/mipmap-xhdpi/ic_launcher.png b/src/tr/turktoon/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/turktoon/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/turktoon/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/turktoon/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/turktoon/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/turktoon/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/turktoon/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/turktoon/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/turktoon/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/turktoon/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/turktoon/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/turktoon/src/TurkToon.kt b/src/tr/turktoon/src/eu/kanade/tachiyomi/extension/tr/turktoon/TurkToon.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/turktoon/src/TurkToon.kt
rename to src/tr/turktoon/src/eu/kanade/tachiyomi/extension/tr/turktoon/TurkToon.kt
diff --git a/src/tr/uzaymanga/build.gradle b/src/tr/uzaymanga/build.gradle
new file mode 100644
index 000000000..c55a8626f
--- /dev/null
+++ b/src/tr/uzaymanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Uzay Manga'
+ extClass = '.UzayManga'
+ themePkg = 'mangathemesia'
+ baseUrl = 'https://uzaymanga.com'
+ overrideVersionCode = 6
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mangathemesia/uzaymanga/res/mipmap-hdpi/ic_launcher.png b/src/tr/uzaymanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/uzaymanga/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/uzaymanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/uzaymanga/res/mipmap-mdpi/ic_launcher.png b/src/tr/uzaymanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/uzaymanga/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/uzaymanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/uzaymanga/res/mipmap-xhdpi/ic_launcher.png b/src/tr/uzaymanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/uzaymanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/uzaymanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/uzaymanga/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/uzaymanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/uzaymanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/uzaymanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/uzaymanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/uzaymanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mangathemesia/uzaymanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/uzaymanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mangathemesia/uzaymanga/src/UzayManga.kt b/src/tr/uzaymanga/src/eu/kanade/tachiyomi/extension/tr/uzaymanga/UzayManga.kt
similarity index 100%
rename from multisrc/overrides/mangathemesia/uzaymanga/src/UzayManga.kt
rename to src/tr/uzaymanga/src/eu/kanade/tachiyomi/extension/tr/uzaymanga/UzayManga.kt
diff --git a/src/tr/webtoonhatti/build.gradle b/src/tr/webtoonhatti/build.gradle
new file mode 100644
index 000000000..efbdcce0d
--- /dev/null
+++ b/src/tr/webtoonhatti/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Webtoon Hatti'
+ extClass = '.WebtoonHatti'
+ themePkg = 'madara'
+ baseUrl = 'https://webtoonhatti.net'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/webtoonhatti/res/mipmap-hdpi/ic_launcher.png b/src/tr/webtoonhatti/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonhatti/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/webtoonhatti/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonhatti/res/mipmap-mdpi/ic_launcher.png b/src/tr/webtoonhatti/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonhatti/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/webtoonhatti/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonhatti/res/mipmap-xhdpi/ic_launcher.png b/src/tr/webtoonhatti/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonhatti/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/webtoonhatti/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonhatti/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/webtoonhatti/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonhatti/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/webtoonhatti/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonhatti/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/webtoonhatti/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoonhatti/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/webtoonhatti/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoonhatti/src/WebtoonHatti.kt b/src/tr/webtoonhatti/src/eu/kanade/tachiyomi/extension/tr/webtoonhatti/WebtoonHatti.kt
similarity index 100%
rename from multisrc/overrides/madara/webtoonhatti/src/WebtoonHatti.kt
rename to src/tr/webtoonhatti/src/eu/kanade/tachiyomi/extension/tr/webtoonhatti/WebtoonHatti.kt
diff --git a/src/tr/webtoontr/build.gradle b/src/tr/webtoontr/build.gradle
new file mode 100644
index 000000000..a75c79fe8
--- /dev/null
+++ b/src/tr/webtoontr/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Webtoon TR'
+ extClass = '.WebtoonTR'
+ themePkg = 'madara'
+ baseUrl = 'https://webtoontr.net'
+ overrideVersionCode = 2
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/webtoontr/res/mipmap-hdpi/ic_launcher.png b/src/tr/webtoontr/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoontr/res/mipmap-hdpi/ic_launcher.png
rename to src/tr/webtoontr/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoontr/res/mipmap-mdpi/ic_launcher.png b/src/tr/webtoontr/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoontr/res/mipmap-mdpi/ic_launcher.png
rename to src/tr/webtoontr/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoontr/res/mipmap-xhdpi/ic_launcher.png b/src/tr/webtoontr/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoontr/res/mipmap-xhdpi/ic_launcher.png
rename to src/tr/webtoontr/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoontr/res/mipmap-xxhdpi/ic_launcher.png b/src/tr/webtoontr/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoontr/res/mipmap-xxhdpi/ic_launcher.png
rename to src/tr/webtoontr/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoontr/res/mipmap-xxxhdpi/ic_launcher.png b/src/tr/webtoontr/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/webtoontr/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/tr/webtoontr/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/webtoontr/src/WebtoonTR.kt b/src/tr/webtoontr/src/eu/kanade/tachiyomi/extension/tr/webtoontr/WebtoonTR.kt
similarity index 100%
rename from multisrc/overrides/madara/webtoontr/src/WebtoonTR.kt
rename to src/tr/webtoontr/src/eu/kanade/tachiyomi/extension/tr/webtoontr/WebtoonTR.kt
diff --git a/src/vi/a3manga/build.gradle b/src/vi/a3manga/build.gradle
new file mode 100644
index 000000000..105038372
--- /dev/null
+++ b/src/vi/a3manga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'A3 Manga'
+ extClass = '.A3Manga'
+ themePkg = 'a3manga'
+ baseUrl = 'https://www.a3manga.store'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/a3manga/a3manga/res/mipmap-hdpi/ic_launcher.png b/src/vi/a3manga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/a3manga/res/mipmap-hdpi/ic_launcher.png
rename to src/vi/a3manga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/a3manga/res/mipmap-mdpi/ic_launcher.png b/src/vi/a3manga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/a3manga/res/mipmap-mdpi/ic_launcher.png
rename to src/vi/a3manga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/a3manga/res/mipmap-xhdpi/ic_launcher.png b/src/vi/a3manga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/a3manga/res/mipmap-xhdpi/ic_launcher.png
rename to src/vi/a3manga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/a3manga/res/mipmap-xxhdpi/ic_launcher.png b/src/vi/a3manga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/a3manga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/vi/a3manga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/a3manga/res/mipmap-xxxhdpi/ic_launcher.png b/src/vi/a3manga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/a3manga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/vi/a3manga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/vi/a3manga/src/eu/kanade/tachiyomi/extension/vi/a3manga/A3Manga.kt b/src/vi/a3manga/src/eu/kanade/tachiyomi/extension/vi/a3manga/A3Manga.kt
new file mode 100644
index 000000000..b5a6ce51d
--- /dev/null
+++ b/src/vi/a3manga/src/eu/kanade/tachiyomi/extension/vi/a3manga/A3Manga.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.vi.a3manga
+
+import eu.kanade.tachiyomi.multisrc.a3manga.A3Manga
+
+class A3Manga : A3Manga("A3 Manga", "https://www.a3manga.store", "vi")
diff --git a/src/vi/blogtruyen/build.gradle b/src/vi/blogtruyen/build.gradle
new file mode 100644
index 000000000..66b917779
--- /dev/null
+++ b/src/vi/blogtruyen/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'BlogTruyen'
+ extClass = '.BlogTruyenMoi'
+ themePkg = 'blogtruyen'
+ baseUrl = 'https://blogtruyenmoi.com'
+ overrideVersionCode = 17
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/blogtruyen/blogtruyen/res/mipmap-hdpi/ic_launcher.png b/src/vi/blogtruyen/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/blogtruyen/blogtruyen/res/mipmap-hdpi/ic_launcher.png
rename to src/vi/blogtruyen/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/blogtruyen/blogtruyen/res/mipmap-mdpi/ic_launcher.png b/src/vi/blogtruyen/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/blogtruyen/blogtruyen/res/mipmap-mdpi/ic_launcher.png
rename to src/vi/blogtruyen/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/blogtruyen/blogtruyen/res/mipmap-xhdpi/ic_launcher.png b/src/vi/blogtruyen/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/blogtruyen/blogtruyen/res/mipmap-xhdpi/ic_launcher.png
rename to src/vi/blogtruyen/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/blogtruyen/blogtruyen/res/mipmap-xxhdpi/ic_launcher.png b/src/vi/blogtruyen/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/blogtruyen/blogtruyen/res/mipmap-xxhdpi/ic_launcher.png
rename to src/vi/blogtruyen/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/blogtruyen/blogtruyen/res/mipmap-xxxhdpi/ic_launcher.png b/src/vi/blogtruyen/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/blogtruyen/blogtruyen/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/vi/blogtruyen/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/blogtruyen/blogtruyen/src/BlogTruyenMoi.kt b/src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/BlogTruyenMoi.kt
similarity index 100%
rename from multisrc/overrides/blogtruyen/blogtruyen/src/BlogTruyenMoi.kt
rename to src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/BlogTruyenMoi.kt
diff --git a/src/vi/blogtruyenvn/build.gradle b/src/vi/blogtruyenvn/build.gradle
new file mode 100644
index 000000000..3cab96312
--- /dev/null
+++ b/src/vi/blogtruyenvn/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'BlogTruyen.vn (unoriginal)'
+ extClass = '.BlogTruyenVn'
+ themePkg = 'blogtruyen'
+ baseUrl = 'https://blogtruyenvn.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/blogtruyen/blogtruyenvn/res/mipmap-hdpi/ic_launcher.png b/src/vi/blogtruyenvn/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/blogtruyen/blogtruyenvn/res/mipmap-hdpi/ic_launcher.png
rename to src/vi/blogtruyenvn/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/blogtruyen/blogtruyenvn/res/mipmap-mdpi/ic_launcher.png b/src/vi/blogtruyenvn/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/blogtruyen/blogtruyenvn/res/mipmap-mdpi/ic_launcher.png
rename to src/vi/blogtruyenvn/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/blogtruyen/blogtruyenvn/res/mipmap-xhdpi/ic_launcher.png b/src/vi/blogtruyenvn/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/blogtruyen/blogtruyenvn/res/mipmap-xhdpi/ic_launcher.png
rename to src/vi/blogtruyenvn/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/blogtruyen/blogtruyenvn/res/mipmap-xxhdpi/ic_launcher.png b/src/vi/blogtruyenvn/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/blogtruyen/blogtruyenvn/res/mipmap-xxhdpi/ic_launcher.png
rename to src/vi/blogtruyenvn/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/blogtruyen/blogtruyenvn/res/mipmap-xxxhdpi/ic_launcher.png b/src/vi/blogtruyenvn/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/blogtruyen/blogtruyenvn/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/vi/blogtruyenvn/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/blogtruyen/blogtruyenvn/src/BlogTruyenVn.kt b/src/vi/blogtruyenvn/src/eu/kanade/tachiyomi/extension/vi/blogtruyenvn/BlogTruyenVn.kt
similarity index 100%
rename from multisrc/overrides/blogtruyen/blogtruyenvn/src/BlogTruyenVn.kt
rename to src/vi/blogtruyenvn/src/eu/kanade/tachiyomi/extension/vi/blogtruyenvn/BlogTruyenVn.kt
diff --git a/src/vi/hentaicube/build.gradle b/src/vi/hentaicube/build.gradle
new file mode 100644
index 000000000..5915bfe68
--- /dev/null
+++ b/src/vi/hentaicube/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'CBHentai'
+ extClass = '.HentaiCB'
+ themePkg = 'madara'
+ baseUrl = 'https://cbhentai.net'
+ overrideVersionCode = 7
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/hentaicube/res/mipmap-hdpi/ic_launcher.png b/src/vi/hentaicube/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaicube/res/mipmap-hdpi/ic_launcher.png
rename to src/vi/hentaicube/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaicube/res/mipmap-mdpi/ic_launcher.png b/src/vi/hentaicube/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaicube/res/mipmap-mdpi/ic_launcher.png
rename to src/vi/hentaicube/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaicube/res/mipmap-xhdpi/ic_launcher.png b/src/vi/hentaicube/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaicube/res/mipmap-xhdpi/ic_launcher.png
rename to src/vi/hentaicube/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaicube/res/mipmap-xxhdpi/ic_launcher.png b/src/vi/hentaicube/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaicube/res/mipmap-xxhdpi/ic_launcher.png
rename to src/vi/hentaicube/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaicube/res/mipmap-xxxhdpi/ic_launcher.png b/src/vi/hentaicube/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/hentaicube/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/vi/hentaicube/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/hentaicube/src/HentaiCB.kt b/src/vi/hentaicube/src/eu/kanade/tachiyomi/extension/vi/hentaicube/HentaiCB.kt
similarity index 100%
rename from multisrc/overrides/madara/hentaicube/src/HentaiCB.kt
rename to src/vi/hentaicube/src/eu/kanade/tachiyomi/extension/vi/hentaicube/HentaiCB.kt
diff --git a/src/vi/nettruyen/build.gradle b/src/vi/nettruyen/build.gradle
new file mode 100644
index 000000000..db89e7c6c
--- /dev/null
+++ b/src/vi/nettruyen/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'NetTruyen'
+ extClass = '.NetTruyen'
+ themePkg = 'wpcomics'
+ baseUrl = 'https://www.nettruyenss.com'
+ overrideVersionCode = 22
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/wpcomics/nettruyen/res/mipmap-hdpi/ic_launcher.png b/src/vi/nettruyen/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/nettruyen/res/mipmap-hdpi/ic_launcher.png
rename to src/vi/nettruyen/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/nettruyen/res/mipmap-mdpi/ic_launcher.png b/src/vi/nettruyen/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/nettruyen/res/mipmap-mdpi/ic_launcher.png
rename to src/vi/nettruyen/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/nettruyen/res/mipmap-xhdpi/ic_launcher.png b/src/vi/nettruyen/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/nettruyen/res/mipmap-xhdpi/ic_launcher.png
rename to src/vi/nettruyen/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/nettruyen/res/mipmap-xxhdpi/ic_launcher.png b/src/vi/nettruyen/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/nettruyen/res/mipmap-xxhdpi/ic_launcher.png
rename to src/vi/nettruyen/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/nettruyen/res/mipmap-xxxhdpi/ic_launcher.png b/src/vi/nettruyen/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/nettruyen/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/vi/nettruyen/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/nettruyen/src/NetTruyen.kt b/src/vi/nettruyen/src/eu/kanade/tachiyomi/extension/vi/nettruyen/NetTruyen.kt
similarity index 100%
rename from multisrc/overrides/wpcomics/nettruyen/src/NetTruyen.kt
rename to src/vi/nettruyen/src/eu/kanade/tachiyomi/extension/vi/nettruyen/NetTruyen.kt
diff --git a/src/vi/ngonphong/build.gradle b/src/vi/ngonphong/build.gradle
new file mode 100644
index 000000000..3471ecb34
--- /dev/null
+++ b/src/vi/ngonphong/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Ngon Phong'
+ extClass = '.NgonPhong'
+ themePkg = 'a3manga'
+ baseUrl = 'https://www.ngonphong.com'
+ overrideVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/a3manga/ngonphong/res/mipmap-hdpi/ic_launcher.png b/src/vi/ngonphong/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/ngonphong/res/mipmap-hdpi/ic_launcher.png
rename to src/vi/ngonphong/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/ngonphong/res/mipmap-mdpi/ic_launcher.png b/src/vi/ngonphong/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/ngonphong/res/mipmap-mdpi/ic_launcher.png
rename to src/vi/ngonphong/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/ngonphong/res/mipmap-xhdpi/ic_launcher.png b/src/vi/ngonphong/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/ngonphong/res/mipmap-xhdpi/ic_launcher.png
rename to src/vi/ngonphong/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/ngonphong/res/mipmap-xxhdpi/ic_launcher.png b/src/vi/ngonphong/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/ngonphong/res/mipmap-xxhdpi/ic_launcher.png
rename to src/vi/ngonphong/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/ngonphong/res/mipmap-xxxhdpi/ic_launcher.png b/src/vi/ngonphong/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/ngonphong/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/vi/ngonphong/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/ngonphong/src/NgonPhong.kt b/src/vi/ngonphong/src/eu/kanade/tachiyomi/extension/vi/ngonphong/NgonPhong.kt
similarity index 100%
rename from multisrc/overrides/a3manga/ngonphong/src/NgonPhong.kt
rename to src/vi/ngonphong/src/eu/kanade/tachiyomi/extension/vi/ngonphong/NgonPhong.kt
diff --git a/src/vi/nhattruyen/build.gradle b/src/vi/nhattruyen/build.gradle
new file mode 100644
index 000000000..f9e6f48a6
--- /dev/null
+++ b/src/vi/nhattruyen/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'NhatTruyen'
+ extClass = '.NhatTruyen'
+ themePkg = 'wpcomics'
+ baseUrl = 'https://nhattruyento.com'
+ overrideVersionCode = 14
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/wpcomics/nhattruyen/res/mipmap-hdpi/ic_launcher.png b/src/vi/nhattruyen/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/nhattruyen/res/mipmap-hdpi/ic_launcher.png
rename to src/vi/nhattruyen/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/nhattruyen/res/mipmap-mdpi/ic_launcher.png b/src/vi/nhattruyen/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/nhattruyen/res/mipmap-mdpi/ic_launcher.png
rename to src/vi/nhattruyen/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/nhattruyen/res/mipmap-xhdpi/ic_launcher.png b/src/vi/nhattruyen/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/nhattruyen/res/mipmap-xhdpi/ic_launcher.png
rename to src/vi/nhattruyen/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/nhattruyen/res/mipmap-xxhdpi/ic_launcher.png b/src/vi/nhattruyen/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/nhattruyen/res/mipmap-xxhdpi/ic_launcher.png
rename to src/vi/nhattruyen/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/nhattruyen/res/mipmap-xxxhdpi/ic_launcher.png b/src/vi/nhattruyen/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/wpcomics/nhattruyen/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/vi/nhattruyen/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/wpcomics/nhattruyen/src/NhatTruyen.kt b/src/vi/nhattruyen/src/eu/kanade/tachiyomi/extension/vi/nhattruyen/NhatTruyen.kt
similarity index 100%
rename from multisrc/overrides/wpcomics/nhattruyen/src/NhatTruyen.kt
rename to src/vi/nhattruyen/src/eu/kanade/tachiyomi/extension/vi/nhattruyen/NhatTruyen.kt
diff --git a/src/vi/ocumeo/build.gradle b/src/vi/ocumeo/build.gradle
new file mode 100644
index 000000000..7dd43e8cf
--- /dev/null
+++ b/src/vi/ocumeo/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'O Cu Meo'
+ extClass = '.OCuMeo'
+ themePkg = 'a3manga'
+ baseUrl = 'https://www.ocumeo.store'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/a3manga/ocumeo/res/mipmap-hdpi/ic_launcher.png b/src/vi/ocumeo/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/ocumeo/res/mipmap-hdpi/ic_launcher.png
rename to src/vi/ocumeo/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/ocumeo/res/mipmap-mdpi/ic_launcher.png b/src/vi/ocumeo/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/ocumeo/res/mipmap-mdpi/ic_launcher.png
rename to src/vi/ocumeo/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/ocumeo/res/mipmap-xhdpi/ic_launcher.png b/src/vi/ocumeo/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/ocumeo/res/mipmap-xhdpi/ic_launcher.png
rename to src/vi/ocumeo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/ocumeo/res/mipmap-xxhdpi/ic_launcher.png b/src/vi/ocumeo/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/ocumeo/res/mipmap-xxhdpi/ic_launcher.png
rename to src/vi/ocumeo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/ocumeo/res/mipmap-xxxhdpi/ic_launcher.png b/src/vi/ocumeo/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/ocumeo/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/vi/ocumeo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/vi/ocumeo/src/eu/kanade/tachiyomi/extension/vi/ocumeo/OCuMeo.kt b/src/vi/ocumeo/src/eu/kanade/tachiyomi/extension/vi/ocumeo/OCuMeo.kt
new file mode 100644
index 000000000..ebbb773e8
--- /dev/null
+++ b/src/vi/ocumeo/src/eu/kanade/tachiyomi/extension/vi/ocumeo/OCuMeo.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.vi.ocumeo
+
+import eu.kanade.tachiyomi.multisrc.a3manga.A3Manga
+
+class OCuMeo : A3Manga("Ổ Cú Mèo", "https://www.ocumeo.store", "vi")
diff --git a/src/vi/teamlanhlung/build.gradle b/src/vi/teamlanhlung/build.gradle
new file mode 100644
index 000000000..f122c4d46
--- /dev/null
+++ b/src/vi/teamlanhlung/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Team Lanh Lung'
+ extClass = '.TeamLanhLung'
+ themePkg = 'a3manga'
+ baseUrl = 'https://teamlanhlung.live'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/a3manga/teamlanhlung/res/mipmap-hdpi/ic_launcher.png b/src/vi/teamlanhlung/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/teamlanhlung/res/mipmap-hdpi/ic_launcher.png
rename to src/vi/teamlanhlung/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/teamlanhlung/res/mipmap-mdpi/ic_launcher.png b/src/vi/teamlanhlung/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/teamlanhlung/res/mipmap-mdpi/ic_launcher.png
rename to src/vi/teamlanhlung/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/teamlanhlung/res/mipmap-xhdpi/ic_launcher.png b/src/vi/teamlanhlung/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/teamlanhlung/res/mipmap-xhdpi/ic_launcher.png
rename to src/vi/teamlanhlung/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/teamlanhlung/res/mipmap-xxhdpi/ic_launcher.png b/src/vi/teamlanhlung/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/teamlanhlung/res/mipmap-xxhdpi/ic_launcher.png
rename to src/vi/teamlanhlung/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/a3manga/teamlanhlung/res/mipmap-xxxhdpi/ic_launcher.png b/src/vi/teamlanhlung/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/a3manga/teamlanhlung/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/vi/teamlanhlung/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/vi/teamlanhlung/src/eu/kanade/tachiyomi/extension/vi/teamlanhlung/TeamLanhLung.kt b/src/vi/teamlanhlung/src/eu/kanade/tachiyomi/extension/vi/teamlanhlung/TeamLanhLung.kt
new file mode 100644
index 000000000..73a9a6459
--- /dev/null
+++ b/src/vi/teamlanhlung/src/eu/kanade/tachiyomi/extension/vi/teamlanhlung/TeamLanhLung.kt
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.extension.vi.teamlanhlung
+
+import eu.kanade.tachiyomi.multisrc.a3manga.A3Manga
+
+class TeamLanhLung : A3Manga("Team Lạnh Lùng", "https://teamlanhlung.live", "vi")
diff --git a/src/vi/truyentranhlh/build.gradle b/src/vi/truyentranhlh/build.gradle
new file mode 100644
index 000000000..e052e1181
--- /dev/null
+++ b/src/vi/truyentranhlh/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'TruyenTranhLH'
+ extClass = '.TruyenTranhLH'
+ themePkg = 'mymangacms'
+ baseUrl = 'https://truyenlh.com'
+ overrideVersionCode = 10
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mymangacms/truyentranhlh/res/mipmap-hdpi/ic_launcher.png b/src/vi/truyentranhlh/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/truyentranhlh/res/mipmap-hdpi/ic_launcher.png
rename to src/vi/truyentranhlh/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/truyentranhlh/res/mipmap-mdpi/ic_launcher.png b/src/vi/truyentranhlh/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/truyentranhlh/res/mipmap-mdpi/ic_launcher.png
rename to src/vi/truyentranhlh/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/truyentranhlh/res/mipmap-xhdpi/ic_launcher.png b/src/vi/truyentranhlh/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/truyentranhlh/res/mipmap-xhdpi/ic_launcher.png
rename to src/vi/truyentranhlh/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/truyentranhlh/res/mipmap-xxhdpi/ic_launcher.png b/src/vi/truyentranhlh/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/truyentranhlh/res/mipmap-xxhdpi/ic_launcher.png
rename to src/vi/truyentranhlh/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/truyentranhlh/res/mipmap-xxxhdpi/ic_launcher.png b/src/vi/truyentranhlh/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mymangacms/truyentranhlh/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/vi/truyentranhlh/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mymangacms/truyentranhlh/src/TruyenTranhLH.kt b/src/vi/truyentranhlh/src/eu/kanade/tachiyomi/extension/vi/truyentranhlh/TruyenTranhLH.kt
similarity index 100%
rename from multisrc/overrides/mymangacms/truyentranhlh/src/TruyenTranhLH.kt
rename to src/vi/truyentranhlh/src/eu/kanade/tachiyomi/extension/vi/truyentranhlh/TruyenTranhLH.kt
diff --git a/src/zh/bakamh/build.gradle b/src/zh/bakamh/build.gradle
new file mode 100644
index 000000000..a0e1d4841
--- /dev/null
+++ b/src/zh/bakamh/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Baka Manhua'
+ extClass = '.Bakamh'
+ themePkg = 'madara'
+ baseUrl = 'https://bakamh.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/madara/bakamh/res/mipmap-hdpi/ic_launcher.png b/src/zh/bakamh/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bakamh/res/mipmap-hdpi/ic_launcher.png
rename to src/zh/bakamh/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bakamh/res/mipmap-mdpi/ic_launcher.png b/src/zh/bakamh/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bakamh/res/mipmap-mdpi/ic_launcher.png
rename to src/zh/bakamh/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bakamh/res/mipmap-xhdpi/ic_launcher.png b/src/zh/bakamh/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bakamh/res/mipmap-xhdpi/ic_launcher.png
rename to src/zh/bakamh/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bakamh/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/bakamh/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bakamh/res/mipmap-xxhdpi/ic_launcher.png
rename to src/zh/bakamh/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bakamh/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/bakamh/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/bakamh/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/zh/bakamh/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/bakamh/src/Bakamh.kt b/src/zh/bakamh/src/eu/kanade/tachiyomi/extension/zh/bakamh/Bakamh.kt
similarity index 100%
rename from multisrc/overrides/madara/bakamh/src/Bakamh.kt
rename to src/zh/bakamh/src/eu/kanade/tachiyomi/extension/zh/bakamh/Bakamh.kt
diff --git a/multisrc/overrides/bilibili/bilibilimanga/AndroidManifest.xml b/src/zh/bilibilimanga/AndroidManifest.xml
similarity index 100%
rename from multisrc/overrides/bilibili/bilibilimanga/AndroidManifest.xml
rename to src/zh/bilibilimanga/AndroidManifest.xml
diff --git a/src/zh/bilibilimanga/build.gradle b/src/zh/bilibilimanga/build.gradle
new file mode 100644
index 000000000..85f7bb308
--- /dev/null
+++ b/src/zh/bilibilimanga/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'BILIBILI MANGA'
+ extClass = '.BilibiliManga'
+ themePkg = 'bilibili'
+ baseUrl = 'https://manga.bilibili.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/bilibili/bilibilimanga/res/mipmap-hdpi/ic_launcher.png b/src/zh/bilibilimanga/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bilibili/bilibilimanga/res/mipmap-hdpi/ic_launcher.png
rename to src/zh/bilibilimanga/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/bilibili/bilibilimanga/res/mipmap-mdpi/ic_launcher.png b/src/zh/bilibilimanga/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bilibili/bilibilimanga/res/mipmap-mdpi/ic_launcher.png
rename to src/zh/bilibilimanga/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/bilibili/bilibilimanga/res/mipmap-xhdpi/ic_launcher.png b/src/zh/bilibilimanga/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bilibili/bilibilimanga/res/mipmap-xhdpi/ic_launcher.png
rename to src/zh/bilibilimanga/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/bilibili/bilibilimanga/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/bilibilimanga/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bilibili/bilibilimanga/res/mipmap-xxhdpi/ic_launcher.png
rename to src/zh/bilibilimanga/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/bilibili/bilibilimanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/bilibilimanga/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/bilibili/bilibilimanga/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/zh/bilibilimanga/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/bilibili/bilibilimanga/src/BilibiliManga.kt b/src/zh/bilibilimanga/src/eu/kanade/tachiyomi/extension/zh/bilibilimanga/BilibiliManga.kt
similarity index 100%
rename from multisrc/overrides/bilibili/bilibilimanga/src/BilibiliManga.kt
rename to src/zh/bilibilimanga/src/eu/kanade/tachiyomi/extension/zh/bilibilimanga/BilibiliManga.kt
diff --git a/src/zh/damaomanhua/build.gradle b/src/zh/damaomanhua/build.gradle
new file mode 100644
index 000000000..307b1dfea
--- /dev/null
+++ b/src/zh/damaomanhua/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Damao Manhua'
+ extClass = '.DamaoManhua'
+ themePkg = 'mccms'
+ baseUrl = 'https://www.hanman.cyou/index.php'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mccms/damaomanhua/src/DamaoManhua.kt b/src/zh/damaomanhua/src/eu/kanade/tachiyomi/extension/zh/damaomanhua/DamaoManhua.kt
similarity index 100%
rename from multisrc/overrides/mccms/damaomanhua/src/DamaoManhua.kt
rename to src/zh/damaomanhua/src/eu/kanade/tachiyomi/extension/zh/damaomanhua/DamaoManhua.kt
diff --git a/src/zh/didamanhua/build.gradle b/src/zh/didamanhua/build.gradle
new file mode 100644
index 000000000..fc9981d10
--- /dev/null
+++ b/src/zh/didamanhua/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'Dida Manhua'
+ extClass = '.DidaManhua'
+ themePkg = 'mccms'
+ baseUrl = 'https://www.didamanhua.com/index.php'
+ overrideVersionCode = 1
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mccms/didamanhua/src/DidaManhua.kt b/src/zh/didamanhua/src/eu/kanade/tachiyomi/extension/zh/didamanhua/DidaManhua.kt
similarity index 100%
rename from multisrc/overrides/mccms/didamanhua/src/DidaManhua.kt
rename to src/zh/didamanhua/src/eu/kanade/tachiyomi/extension/zh/didamanhua/DidaManhua.kt
diff --git a/src/zh/dongmanmanhua/build.gradle b/src/zh/dongmanmanhua/build.gradle
new file mode 100644
index 000000000..6f0697ae0
--- /dev/null
+++ b/src/zh/dongmanmanhua/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Dongman Manhua'
+ extClass = '.DongmanManhua'
+ themePkg = 'webtoons'
+ baseUrl = 'https://www.dongmanmanhua.cn'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/webtoons/dongmanmanhua/res/mipmap-hdpi/ic_launcher.png b/src/zh/dongmanmanhua/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/webtoons/dongmanmanhua/res/mipmap-hdpi/ic_launcher.png
rename to src/zh/dongmanmanhua/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/webtoons/dongmanmanhua/res/mipmap-mdpi/ic_launcher.png b/src/zh/dongmanmanhua/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/webtoons/dongmanmanhua/res/mipmap-mdpi/ic_launcher.png
rename to src/zh/dongmanmanhua/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/webtoons/dongmanmanhua/res/mipmap-xhdpi/ic_launcher.png b/src/zh/dongmanmanhua/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/webtoons/dongmanmanhua/res/mipmap-xhdpi/ic_launcher.png
rename to src/zh/dongmanmanhua/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/webtoons/dongmanmanhua/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/dongmanmanhua/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/webtoons/dongmanmanhua/res/mipmap-xxhdpi/ic_launcher.png
rename to src/zh/dongmanmanhua/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/webtoons/dongmanmanhua/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/dongmanmanhua/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/webtoons/dongmanmanhua/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/zh/dongmanmanhua/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/webtoons/dongmanmanhua/src/DongmanManhua.kt b/src/zh/dongmanmanhua/src/eu/kanade/tachiyomi/extension/zh/dongmanmanhua/DongmanManhua.kt
similarity index 100%
rename from multisrc/overrides/webtoons/dongmanmanhua/src/DongmanManhua.kt
rename to src/zh/dongmanmanhua/src/eu/kanade/tachiyomi/extension/zh/dongmanmanhua/DongmanManhua.kt
diff --git a/src/zh/gufengmh/build.gradle b/src/zh/gufengmh/build.gradle
new file mode 100644
index 000000000..df24d129e
--- /dev/null
+++ b/src/zh/gufengmh/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Gufeng Manhua'
+ extClass = '.Gufengmh'
+ themePkg = 'sinmh'
+ baseUrl = 'https://www.gufengmh.com'
+ overrideVersionCode = 6
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/sinmh/gufengmh/res/mipmap-hdpi/ic_launcher.png b/src/zh/gufengmh/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/gufengmh/res/mipmap-hdpi/ic_launcher.png
rename to src/zh/gufengmh/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/gufengmh/res/mipmap-mdpi/ic_launcher.png b/src/zh/gufengmh/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/gufengmh/res/mipmap-mdpi/ic_launcher.png
rename to src/zh/gufengmh/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/gufengmh/res/mipmap-xhdpi/ic_launcher.png b/src/zh/gufengmh/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/gufengmh/res/mipmap-xhdpi/ic_launcher.png
rename to src/zh/gufengmh/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/gufengmh/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/gufengmh/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/gufengmh/res/mipmap-xxhdpi/ic_launcher.png
rename to src/zh/gufengmh/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/gufengmh/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/gufengmh/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/gufengmh/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/zh/gufengmh/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/gufengmh/src/Gufengmh.kt b/src/zh/gufengmh/src/eu/kanade/tachiyomi/extension/zh/gufengmh/Gufengmh.kt
similarity index 100%
rename from multisrc/overrides/sinmh/gufengmh/src/Gufengmh.kt
rename to src/zh/gufengmh/src/eu/kanade/tachiyomi/extension/zh/gufengmh/Gufengmh.kt
diff --git a/src/zh/hanman18/build.gradle b/src/zh/hanman18/build.gradle
new file mode 100644
index 000000000..d8af30c1a
--- /dev/null
+++ b/src/zh/hanman18/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'HANMAN18'
+ extClass = '.HANMAN18'
+ themePkg = 'manga18'
+ baseUrl = 'https://hanman18.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/manga18/hanman18/src/HANMAN18.kt b/src/zh/hanman18/src/eu/kanade/tachiyomi/extension/zh/hanman18/HANMAN18.kt
similarity index 100%
rename from multisrc/overrides/manga18/hanman18/src/HANMAN18.kt
rename to src/zh/hanman18/src/eu/kanade/tachiyomi/extension/zh/hanman18/HANMAN18.kt
diff --git a/src/zh/jiuermanhua/build.gradle b/src/zh/jiuermanhua/build.gradle
new file mode 100644
index 000000000..3ad0d0e67
--- /dev/null
+++ b/src/zh/jiuermanhua/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = '92Manhua'
+ extClass = '.JiuerManhua'
+ themePkg = 'sinmh'
+ baseUrl = 'http://www.92mh.com'
+ overrideVersionCode = 0
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/sinmh/jiuermanhua/res/mipmap-hdpi/ic_launcher.png b/src/zh/jiuermanhua/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/jiuermanhua/res/mipmap-hdpi/ic_launcher.png
rename to src/zh/jiuermanhua/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/jiuermanhua/res/mipmap-mdpi/ic_launcher.png b/src/zh/jiuermanhua/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/jiuermanhua/res/mipmap-mdpi/ic_launcher.png
rename to src/zh/jiuermanhua/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/jiuermanhua/res/mipmap-xhdpi/ic_launcher.png b/src/zh/jiuermanhua/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/jiuermanhua/res/mipmap-xhdpi/ic_launcher.png
rename to src/zh/jiuermanhua/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/jiuermanhua/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/jiuermanhua/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/jiuermanhua/res/mipmap-xxhdpi/ic_launcher.png
rename to src/zh/jiuermanhua/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/jiuermanhua/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/jiuermanhua/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/jiuermanhua/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/zh/jiuermanhua/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/jiuermanhua/src/JiuerManhua.kt b/src/zh/jiuermanhua/src/eu/kanade/tachiyomi/extension/zh/jiuermanhua/JiuerManhua.kt
similarity index 100%
rename from multisrc/overrides/sinmh/jiuermanhua/src/JiuerManhua.kt
rename to src/zh/jiuermanhua/src/eu/kanade/tachiyomi/extension/zh/jiuermanhua/JiuerManhua.kt
diff --git a/src/zh/kuaikuai3/build.gradle b/src/zh/kuaikuai3/build.gradle
new file mode 100644
index 000000000..c8a7773d1
--- /dev/null
+++ b/src/zh/kuaikuai3/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Kuaikuai Manhua 3'
+ extClass = '.Kuaikuai3'
+ themePkg = 'mccms'
+ baseUrl = 'https://mobile3.manhuaorg.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mccms/kuaikuai3/src/DecryptInterceptor.kt b/src/zh/kuaikuai3/src/eu/kanade/tachiyomi/extension/zh/kuaikuai3/DecryptInterceptor.kt
similarity index 100%
rename from multisrc/overrides/mccms/kuaikuai3/src/DecryptInterceptor.kt
rename to src/zh/kuaikuai3/src/eu/kanade/tachiyomi/extension/zh/kuaikuai3/DecryptInterceptor.kt
diff --git a/multisrc/overrides/mccms/kuaikuai3/src/Kuaikuai3.kt b/src/zh/kuaikuai3/src/eu/kanade/tachiyomi/extension/zh/kuaikuai3/Kuaikuai3.kt
similarity index 100%
rename from multisrc/overrides/mccms/kuaikuai3/src/Kuaikuai3.kt
rename to src/zh/kuaikuai3/src/eu/kanade/tachiyomi/extension/zh/kuaikuai3/Kuaikuai3.kt
diff --git a/multisrc/overrides/mccms/kuaikuai3/src/MCCMSReduced.kt b/src/zh/kuaikuai3/src/eu/kanade/tachiyomi/extension/zh/kuaikuai3/MCCMSReduced.kt
similarity index 100%
rename from multisrc/overrides/mccms/kuaikuai3/src/MCCMSReduced.kt
rename to src/zh/kuaikuai3/src/eu/kanade/tachiyomi/extension/zh/kuaikuai3/MCCMSReduced.kt
diff --git a/src/zh/manhuadui/build.gradle b/src/zh/manhuadui/build.gradle
new file mode 100644
index 000000000..06041b327
--- /dev/null
+++ b/src/zh/manhuadui/build.gradle
@@ -0,0 +1,10 @@
+ext {
+ extName = 'YKMH'
+ extClass = '.YKMH'
+ themePkg = 'sinmh'
+ baseUrl = 'http://www.ykmh.com'
+ overrideVersionCode = 17
+ isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/sinmh/manhuadui/res/mipmap-hdpi/ic_launcher.png b/src/zh/manhuadui/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/manhuadui/res/mipmap-hdpi/ic_launcher.png
rename to src/zh/manhuadui/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/manhuadui/res/mipmap-mdpi/ic_launcher.png b/src/zh/manhuadui/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/manhuadui/res/mipmap-mdpi/ic_launcher.png
rename to src/zh/manhuadui/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/manhuadui/res/mipmap-xhdpi/ic_launcher.png b/src/zh/manhuadui/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/manhuadui/res/mipmap-xhdpi/ic_launcher.png
rename to src/zh/manhuadui/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/manhuadui/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/manhuadui/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/manhuadui/res/mipmap-xxhdpi/ic_launcher.png
rename to src/zh/manhuadui/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/manhuadui/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/manhuadui/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/manhuadui/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/zh/manhuadui/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/manhuadui/src/YKMH.kt b/src/zh/manhuadui/src/eu/kanade/tachiyomi/extension/zh/manhuadui/YKMH.kt
similarity index 100%
rename from multisrc/overrides/sinmh/manhuadui/src/YKMH.kt
rename to src/zh/manhuadui/src/eu/kanade/tachiyomi/extension/zh/manhuadui/YKMH.kt
diff --git a/src/zh/miaoshang/build.gradle b/src/zh/miaoshang/build.gradle
new file mode 100644
index 000000000..9813b68b7
--- /dev/null
+++ b/src/zh/miaoshang/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Miaoshang Manhua'
+ extClass = '.Miaoshang'
+ themePkg = 'mccms'
+ baseUrl = 'https://www.miaoshangmanhua.com'
+ overrideVersionCode = 0
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mccms/miaoshang/res/mipmap-hdpi/ic_launcher.png b/src/zh/miaoshang/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/miaoshang/res/mipmap-hdpi/ic_launcher.png
rename to src/zh/miaoshang/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/miaoshang/res/mipmap-mdpi/ic_launcher.png b/src/zh/miaoshang/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/miaoshang/res/mipmap-mdpi/ic_launcher.png
rename to src/zh/miaoshang/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/miaoshang/res/mipmap-xhdpi/ic_launcher.png b/src/zh/miaoshang/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/miaoshang/res/mipmap-xhdpi/ic_launcher.png
rename to src/zh/miaoshang/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/miaoshang/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/miaoshang/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/miaoshang/res/mipmap-xxhdpi/ic_launcher.png
rename to src/zh/miaoshang/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/miaoshang/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/miaoshang/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/miaoshang/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/zh/miaoshang/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/miaoshang/src/Miaoshang.kt b/src/zh/miaoshang/src/eu/kanade/tachiyomi/extension/zh/miaoshang/Miaoshang.kt
similarity index 100%
rename from multisrc/overrides/mccms/miaoshang/src/Miaoshang.kt
rename to src/zh/miaoshang/src/eu/kanade/tachiyomi/extension/zh/miaoshang/Miaoshang.kt
diff --git a/src/zh/onemanhua/build.gradle b/src/zh/onemanhua/build.gradle
new file mode 100644
index 000000000..28ef14713
--- /dev/null
+++ b/src/zh/onemanhua/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'COLAMANGA'
+ extClass = '.Onemanhua'
+ themePkg = 'colamanga'
+ baseUrl = 'https://www.colamanga.com'
+ overrideVersionCode = 15
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/colamanga/onemanhua/res/mipmap-hdpi/ic_launcher.png b/src/zh/onemanhua/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colamanga/onemanhua/res/mipmap-hdpi/ic_launcher.png
rename to src/zh/onemanhua/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/colamanga/onemanhua/res/mipmap-mdpi/ic_launcher.png b/src/zh/onemanhua/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colamanga/onemanhua/res/mipmap-mdpi/ic_launcher.png
rename to src/zh/onemanhua/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/colamanga/onemanhua/res/mipmap-xhdpi/ic_launcher.png b/src/zh/onemanhua/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colamanga/onemanhua/res/mipmap-xhdpi/ic_launcher.png
rename to src/zh/onemanhua/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colamanga/onemanhua/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/onemanhua/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colamanga/onemanhua/res/mipmap-xxhdpi/ic_launcher.png
rename to src/zh/onemanhua/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colamanga/onemanhua/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/onemanhua/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/colamanga/onemanhua/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/zh/onemanhua/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/colamanga/onemanhua/src/Onemanhua.kt b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/Onemanhua.kt
similarity index 100%
rename from multisrc/overrides/colamanga/onemanhua/src/Onemanhua.kt
rename to src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/Onemanhua.kt
diff --git a/src/zh/qinqin/build.gradle b/src/zh/qinqin/build.gradle
new file mode 100644
index 000000000..1c7bbef3a
--- /dev/null
+++ b/src/zh/qinqin/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = 'Qinqin Manhua'
+ extClass = '.Qinqin'
+ themePkg = 'sinmh'
+ baseUrl = 'http://www.acgwd.com'
+ overrideVersionCode = 2
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/sinmh/qinqin/res/mipmap-hdpi/ic_launcher.png b/src/zh/qinqin/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/qinqin/res/mipmap-hdpi/ic_launcher.png
rename to src/zh/qinqin/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/qinqin/res/mipmap-mdpi/ic_launcher.png b/src/zh/qinqin/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/qinqin/res/mipmap-mdpi/ic_launcher.png
rename to src/zh/qinqin/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/qinqin/res/mipmap-xhdpi/ic_launcher.png b/src/zh/qinqin/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/qinqin/res/mipmap-xhdpi/ic_launcher.png
rename to src/zh/qinqin/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/qinqin/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/qinqin/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/qinqin/res/mipmap-xxhdpi/ic_launcher.png
rename to src/zh/qinqin/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/qinqin/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/qinqin/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/sinmh/qinqin/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/zh/qinqin/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/sinmh/qinqin/src/Qinqin.kt b/src/zh/qinqin/src/eu/kanade/tachiyomi/extension/zh/qinqin/Qinqin.kt
similarity index 100%
rename from multisrc/overrides/sinmh/qinqin/src/Qinqin.kt
rename to src/zh/qinqin/src/eu/kanade/tachiyomi/extension/zh/qinqin/Qinqin.kt
diff --git a/src/zh/sixmh/build.gradle b/src/zh/sixmh/build.gradle
new file mode 100644
index 000000000..7576c816e
--- /dev/null
+++ b/src/zh/sixmh/build.gradle
@@ -0,0 +1,9 @@
+ext {
+ extName = '6Manhua'
+ extClass = '.SixMH'
+ themePkg = 'mccms'
+ baseUrl = 'https://www.liumanhua.com'
+ overrideVersionCode = 4
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mccms/sixmh/res/mipmap-hdpi/ic_launcher.png b/src/zh/sixmh/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/sixmh/res/mipmap-hdpi/ic_launcher.png
rename to src/zh/sixmh/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/sixmh/res/mipmap-mdpi/ic_launcher.png b/src/zh/sixmh/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/sixmh/res/mipmap-mdpi/ic_launcher.png
rename to src/zh/sixmh/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/sixmh/res/mipmap-xhdpi/ic_launcher.png b/src/zh/sixmh/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/sixmh/res/mipmap-xhdpi/ic_launcher.png
rename to src/zh/sixmh/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/sixmh/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/sixmh/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/sixmh/res/mipmap-xxhdpi/ic_launcher.png
rename to src/zh/sixmh/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/sixmh/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/sixmh/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mccms/sixmh/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/zh/sixmh/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mccms/sixmh/src/SixMH.kt b/src/zh/sixmh/src/eu/kanade/tachiyomi/extension/zh/sixmh/SixMH.kt
similarity index 100%
rename from multisrc/overrides/mccms/sixmh/src/SixMH.kt
rename to src/zh/sixmh/src/eu/kanade/tachiyomi/extension/zh/sixmh/SixMH.kt