From f1a7a5aac2a38ad61d58572e60d8af00c40c6d48 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Mon, 8 Feb 2021 09:01:24 -0800 Subject: [PATCH] restructure multisrc overrides (#5701) --- .../default_res}/mipmap-hdpi/ic_launcher.png | Bin .../default_res}/mipmap-mdpi/ic_launcher.png | Bin .../default_res}/mipmap-xhdpi/ic_launcher.png | Bin .../mipmap-xxhdpi/ic_launcher.png | Bin .../mipmap-xxxhdpi/ic_launcher.png | Bin .../default_res}/web_hi_res_512.png | Bin .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../letitgoscans/res}/web_hi_res_512.png | Bin .../letitgoscans/src}/LetItGoScans.kt | 0 .../whimsubs/res}/mipmap-hdpi/ic_launcher.png | Bin .../whimsubs/res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../whimsubs/res}/web_hi_res_512.png | Bin .../default_res}/mipmap-hdpi/ic_launcher.png | Bin .../default_res}/mipmap-mdpi/ic_launcher.png | Bin .../default_res}/mipmap-xhdpi/ic_launcher.png | Bin .../mipmap-xxhdpi/ic_launcher.png | Bin .../mipmap-xxxhdpi/ic_launcher.png | Bin .../default_res}/web_hi_res_512.png | Bin .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../edelgardescans/res}/web_hi_res_512.png | Bin .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../hatigarmscans/res}/web_hi_res_512.png | Bin .../hatigarmscans/src}/HatigarmScans.kt | 0 .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../hunlightscans/res}/web_hi_res_512.png | Bin .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../leviatanscans/res}/web_hi_res_512.png | Bin .../src}/LeviatanScansFactory.kt | 0 .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../methodscans/res}/web_hi_res_512.png | Bin .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../reaperscans/res}/web_hi_res_512.png | Bin .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../secretscans/res}/web_hi_res_512.png | Bin .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../res}/web_hi_res_512.png | Bin .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../thenonamesscans/res}/web_hi_res_512.png | Bin .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../zeroscans/res}/web_hi_res_512.png | Bin .../adonisfansub/src}/AdonisFansub.kt | 0 .../src}/AgentofChangeTranslations.kt | 0 .../allporncomic/src}/AllPornComic.kt | 0 .../aloalivn/src}/Aloalivn.kt | 0 .../animangaes/src}/AniMangaEs.kt | 0 .../apollcomics/src}/ApollComics.kt | 0 .../arangscans/src}/ArangScans.kt | 0 .../araznovel/src}/ArazNovel.kt | 0 .../argosscan/src}/ArgosScan.kt | 0 .../astrallibrary/src}/AstralLibrary.kt | 0 .../atikrost/src}/Atikrost.kt | 0 .../atmsubs => madara/atmsubs/src}/ATMSubs.kt | 0 .../azora => madara/azora/src}/Azora.kt | 0 .../bestmanga/src}/BestManga.kt | 0 .../cattranslator/src}/CatTranslator.kt | 0 .../chibimanga/src}/ChibiManga.kt | 0 .../clovermanga/src}/CloverManga.kt | 0 .../comickiba/src}/ComicKiba.kt | 0 .../cutiepie/src}/CutiePie.kt | 0 .../default_res}/mipmap-hdpi/ic_launcher.png | Bin .../default_res}/mipmap-mdpi/ic_launcher.png | Bin .../default_res}/mipmap-xhdpi/ic_launcher.png | Bin .../mipmap-xxhdpi/ic_launcher.png | Bin .../mipmap-xxxhdpi/ic_launcher.png | Bin .../default_res}/web_hi_res_512.png | Bin .../diamondfansub/src}/DiamondFansub.kt | 0 .../disasterscans/src}/DisasterScans.kt | 0 .../doujinhentai/src}/DoujinHentai.kt | 0 .../doujinyosh/src}/DoujinYosh.kt | 0 .../dropescan/src}/DropeScan.kt | 0 .../fdmscan => madara/fdmscan/src}/FDMScan.kt | 0 .../firstkissmanga/src}/FirstKissManga.kt | 0 .../firstkissmanhua/src}/FirstKissManhua.kt | 0 .../furioscans/src}/FurioScans.kt | 0 .../geceninlordu/src}/GeceninLordu.kt | 0 .../goldenmanga/src}/GoldenManga.kt | 0 .../hikariscan/src}/HikariScan.kt | 0 .../himerafansub/src}/HimeraFansub.kt | 0 .../hiperdex/src}/Hiperdex.kt | 0 .../default_res}/mipmap-hdpi/ic_launcher.png | Bin .../default_res}/mipmap-mdpi/ic_launcher.png | Bin .../default_res}/mipmap-xhdpi/ic_launcher.png | Bin .../mipmap-xxhdpi/ic_launcher.png | Bin .../mipmap-xxxhdpi/ic_launcher.png | Bin .../default_res}/web_hi_res_512.png | Bin .../mangabat/res}/mipmap-hdpi/ic_launcher.png | Bin .../mangabat/res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../mangabat/res}/web_hi_res_512.png | Bin .../mangabat/src}/Mangabat.kt | 0 .../mangairo/res}/mipmap-hdpi/ic_launcher.png | Bin .../mangairo/res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../mangairo/res}/web_hi_res_512.png | Bin .../mangairo/src}/Mangairo.kt | 0 .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../mangakakalot/res}/web_hi_res_512.png | Bin .../mangakakalot/src}/Mangakakalot.kt | 0 .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../mangakakalots/res}/web_hi_res_512.png | Bin .../mangakakalots/src}/Mangakakalots.kt | 0 .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../mangakita/res}/web_hi_res_512.png | Bin .../res}/mipmap-hdpi/ic_launcher.png | Bin .../res}/mipmap-mdpi/ic_launcher.png | Bin .../res}/mipmap-xhdpi/ic_launcher.png | Bin .../res}/mipmap-xxhdpi/ic_launcher.png | Bin .../res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../manganelo/res}/web_hi_res_512.png | Bin .../manganelo/src}/Manganelo.kt | 0 .../multisrc/ThemeSourceGenerator.kt | 31 +++++++++--------- 174 files changed, 16 insertions(+), 15 deletions(-) rename multisrc/overrides/{res/comicake/default => comicake/default_res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/default => comicake/default_res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/default => comicake/default_res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/default => comicake/default_res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/default => comicake/default_res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/default => comicake/default_res}/web_hi_res_512.png (100%) rename multisrc/overrides/{res/comicake/letitgoscans => comicake/letitgoscans/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/letitgoscans => comicake/letitgoscans/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/letitgoscans => comicake/letitgoscans/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/letitgoscans => comicake/letitgoscans/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/letitgoscans => comicake/letitgoscans/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/letitgoscans => comicake/letitgoscans/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{src/comicake/letitgoscans => comicake/letitgoscans/src}/LetItGoScans.kt (100%) rename multisrc/overrides/{res/comicake/whimsubs => comicake/whimsubs/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/whimsubs => comicake/whimsubs/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/whimsubs => comicake/whimsubs/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/whimsubs => comicake/whimsubs/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/whimsubs => comicake/whimsubs/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/comicake/whimsubs => comicake/whimsubs/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{res/genkan/default => genkan/default_res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/default => genkan/default_res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/default => genkan/default_res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/default => genkan/default_res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/default => genkan/default_res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/default => genkan/default_res}/web_hi_res_512.png (100%) rename multisrc/overrides/{res/genkan/edelgardescans => genkan/edelgardescans/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/edelgardescans => genkan/edelgardescans/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/edelgardescans => genkan/edelgardescans/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/edelgardescans => genkan/edelgardescans/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/edelgardescans => genkan/edelgardescans/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/edelgardescans => genkan/edelgardescans/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{res/genkan/hatigarmscans => genkan/hatigarmscans/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/hatigarmscans => genkan/hatigarmscans/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/hatigarmscans => genkan/hatigarmscans/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/hatigarmscans => genkan/hatigarmscans/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/hatigarmscans => genkan/hatigarmscans/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/hatigarmscans => genkan/hatigarmscans/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{src/genkan/hatigarmscans => genkan/hatigarmscans/src}/HatigarmScans.kt (100%) rename multisrc/overrides/{res/genkan/hunlightscans => genkan/hunlightscans/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/hunlightscans => genkan/hunlightscans/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/hunlightscans => genkan/hunlightscans/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/hunlightscans => genkan/hunlightscans/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/hunlightscans => genkan/hunlightscans/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/hunlightscans => genkan/hunlightscans/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{res/genkan/leviatanscans => genkan/leviatanscans/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/leviatanscans => genkan/leviatanscans/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/leviatanscans => genkan/leviatanscans/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/leviatanscans => genkan/leviatanscans/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/leviatanscans => genkan/leviatanscans/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/leviatanscans => genkan/leviatanscans/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{src/genkan/leviatanscans => genkan/leviatanscans/src}/LeviatanScansFactory.kt (100%) rename multisrc/overrides/{res/genkan/methodscans => genkan/methodscans/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/methodscans => genkan/methodscans/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/methodscans => genkan/methodscans/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/methodscans => genkan/methodscans/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/methodscans => genkan/methodscans/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/methodscans => genkan/methodscans/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{res/genkan/reaperscans => genkan/reaperscans/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/reaperscans => genkan/reaperscans/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/reaperscans => genkan/reaperscans/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/reaperscans => genkan/reaperscans/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/reaperscans => genkan/reaperscans/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/reaperscans => genkan/reaperscans/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{res/genkan/secretscans => genkan/secretscans/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/secretscans => genkan/secretscans/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/secretscans => genkan/secretscans/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/secretscans => genkan/secretscans/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/secretscans => genkan/secretscans/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/secretscans => genkan/secretscans/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{res/genkan/sleepingknightscans => genkan/sleepingknightscans/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/sleepingknightscans => genkan/sleepingknightscans/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/sleepingknightscans => genkan/sleepingknightscans/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/sleepingknightscans => genkan/sleepingknightscans/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/sleepingknightscans => genkan/sleepingknightscans/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/sleepingknightscans => genkan/sleepingknightscans/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{res/genkan/thenonamesscans => genkan/thenonamesscans/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/thenonamesscans => genkan/thenonamesscans/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/thenonamesscans => genkan/thenonamesscans/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/thenonamesscans => genkan/thenonamesscans/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/thenonamesscans => genkan/thenonamesscans/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/thenonamesscans => genkan/thenonamesscans/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{res/genkan/zeroscans => genkan/zeroscans/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/zeroscans => genkan/zeroscans/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/zeroscans => genkan/zeroscans/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/zeroscans => genkan/zeroscans/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/zeroscans => genkan/zeroscans/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/genkan/zeroscans => genkan/zeroscans/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{src/madara/adonisfansub => madara/adonisfansub/src}/AdonisFansub.kt (100%) rename multisrc/overrides/{src/madara/agentofchangetranslations => madara/agentofchangetranslations/src}/AgentofChangeTranslations.kt (100%) rename multisrc/overrides/{src/madara/allporncomic => madara/allporncomic/src}/AllPornComic.kt (100%) rename multisrc/overrides/{src/madara/aloalivn => madara/aloalivn/src}/Aloalivn.kt (100%) rename multisrc/overrides/{src/madara/animangaes => madara/animangaes/src}/AniMangaEs.kt (100%) rename multisrc/overrides/{src/madara/apollcomics => madara/apollcomics/src}/ApollComics.kt (100%) rename multisrc/overrides/{src/madara/arangscans => madara/arangscans/src}/ArangScans.kt (100%) rename multisrc/overrides/{src/madara/araznovel => madara/araznovel/src}/ArazNovel.kt (100%) rename multisrc/overrides/{src/madara/argosscan => madara/argosscan/src}/ArgosScan.kt (100%) rename multisrc/overrides/{src/madara/astrallibrary => madara/astrallibrary/src}/AstralLibrary.kt (100%) rename multisrc/overrides/{src/madara/atikrost => madara/atikrost/src}/Atikrost.kt (100%) rename multisrc/overrides/{src/madara/atmsubs => madara/atmsubs/src}/ATMSubs.kt (100%) rename multisrc/overrides/{src/madara/azora => madara/azora/src}/Azora.kt (100%) rename multisrc/overrides/{src/madara/bestmanga => madara/bestmanga/src}/BestManga.kt (100%) rename multisrc/overrides/{src/madara/cattranslator => madara/cattranslator/src}/CatTranslator.kt (100%) rename multisrc/overrides/{src/madara/chibimanga => madara/chibimanga/src}/ChibiManga.kt (100%) rename multisrc/overrides/{src/madara/clovermanga => madara/clovermanga/src}/CloverManga.kt (100%) rename multisrc/overrides/{src/madara/comickiba => madara/comickiba/src}/ComicKiba.kt (100%) rename multisrc/overrides/{src/madara/cutiepie => madara/cutiepie/src}/CutiePie.kt (100%) rename multisrc/overrides/{res/madara/default => madara/default_res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/madara/default => madara/default_res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/madara/default => madara/default_res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/madara/default => madara/default_res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/madara/default => madara/default_res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/madara/default => madara/default_res}/web_hi_res_512.png (100%) rename multisrc/overrides/{src/madara/diamondfansub => madara/diamondfansub/src}/DiamondFansub.kt (100%) rename multisrc/overrides/{src/madara/disasterscans => madara/disasterscans/src}/DisasterScans.kt (100%) rename multisrc/overrides/{src/madara/doujinhentai => madara/doujinhentai/src}/DoujinHentai.kt (100%) rename multisrc/overrides/{src/madara/doujinyosh => madara/doujinyosh/src}/DoujinYosh.kt (100%) rename multisrc/overrides/{src/madara/dropescan => madara/dropescan/src}/DropeScan.kt (100%) rename multisrc/overrides/{src/madara/fdmscan => madara/fdmscan/src}/FDMScan.kt (100%) rename multisrc/overrides/{src/madara/firstkissmanga => madara/firstkissmanga/src}/FirstKissManga.kt (100%) rename multisrc/overrides/{src/madara/firstkissmanhua => madara/firstkissmanhua/src}/FirstKissManhua.kt (100%) rename multisrc/overrides/{src/madara/furioscans => madara/furioscans/src}/FurioScans.kt (100%) rename multisrc/overrides/{src/madara/geceninlordu => madara/geceninlordu/src}/GeceninLordu.kt (100%) rename multisrc/overrides/{src/madara/goldenmanga => madara/goldenmanga/src}/GoldenManga.kt (100%) rename multisrc/overrides/{src/madara/hikariscan => madara/hikariscan/src}/HikariScan.kt (100%) rename multisrc/overrides/{src/madara/himerafansub => madara/himerafansub/src}/HimeraFansub.kt (100%) rename multisrc/overrides/{src/madara/hiperdex => madara/hiperdex/src}/Hiperdex.kt (100%) rename multisrc/overrides/{res/mangabox/default => mangabox/default_res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/default => mangabox/default_res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/default => mangabox/default_res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/default => mangabox/default_res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/default => mangabox/default_res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/default => mangabox/default_res}/web_hi_res_512.png (100%) rename multisrc/overrides/{res/mangabox/mangabat => mangabox/mangabat/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangabat => mangabox/mangabat/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangabat => mangabox/mangabat/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangabat => mangabox/mangabat/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangabat => mangabox/mangabat/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangabat => mangabox/mangabat/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{src/mangabox/mangabat => mangabox/mangabat/src}/Mangabat.kt (100%) rename multisrc/overrides/{res/mangabox/mangairo => mangabox/mangairo/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangairo => mangabox/mangairo/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangairo => mangabox/mangairo/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangairo => mangabox/mangairo/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangairo => mangabox/mangairo/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangairo => mangabox/mangairo/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{src/mangabox/mangairo => mangabox/mangairo/src}/Mangairo.kt (100%) rename multisrc/overrides/{res/mangabox/mangakakalot => mangabox/mangakakalot/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakakalot => mangabox/mangakakalot/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakakalot => mangabox/mangakakalot/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakakalot => mangabox/mangakakalot/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakakalot => mangabox/mangakakalot/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakakalot => mangabox/mangakakalot/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{src/mangabox/mangakakalot => mangabox/mangakakalot/src}/Mangakakalot.kt (100%) rename multisrc/overrides/{res/mangabox/mangakakalots => mangabox/mangakakalots/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakakalots => mangabox/mangakakalots/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakakalots => mangabox/mangakakalots/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakakalots => mangabox/mangakakalots/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakakalots => mangabox/mangakakalots/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakakalots => mangabox/mangakakalots/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{src/mangabox/mangakakalots => mangabox/mangakakalots/src}/Mangakakalots.kt (100%) rename multisrc/overrides/{res/mangabox/mangakita => mangabox/mangakita/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakita => mangabox/mangakita/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakita => mangabox/mangakita/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakita => mangabox/mangakita/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakita => mangabox/mangakita/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/mangakita => mangabox/mangakita/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{res/mangabox/manganelo => mangabox/manganelo/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/manganelo => mangabox/manganelo/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/manganelo => mangabox/manganelo/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/manganelo => mangabox/manganelo/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/manganelo => mangabox/manganelo/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{res/mangabox/manganelo => mangabox/manganelo/res}/web_hi_res_512.png (100%) rename multisrc/overrides/{src/mangabox/manganelo => mangabox/manganelo/src}/Manganelo.kt (100%) diff --git a/multisrc/overrides/res/comicake/default/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/comicake/default_res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/default/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/comicake/default_res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/default/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/comicake/default_res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/default/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/comicake/default_res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/default/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/comicake/default_res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/default/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/comicake/default_res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/default/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/comicake/default_res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/default/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/comicake/default_res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/default/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/comicake/default_res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/default/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/comicake/default_res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/default/web_hi_res_512.png b/multisrc/overrides/comicake/default_res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/comicake/default/web_hi_res_512.png rename to multisrc/overrides/comicake/default_res/web_hi_res_512.png diff --git a/multisrc/overrides/res/comicake/letitgoscans/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/comicake/letitgoscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/letitgoscans/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/comicake/letitgoscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/letitgoscans/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/comicake/letitgoscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/letitgoscans/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/comicake/letitgoscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/letitgoscans/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/comicake/letitgoscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/letitgoscans/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/comicake/letitgoscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/letitgoscans/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/comicake/letitgoscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/letitgoscans/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/comicake/letitgoscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/letitgoscans/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/comicake/letitgoscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/letitgoscans/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/comicake/letitgoscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/letitgoscans/web_hi_res_512.png b/multisrc/overrides/comicake/letitgoscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/comicake/letitgoscans/web_hi_res_512.png rename to multisrc/overrides/comicake/letitgoscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/src/comicake/letitgoscans/LetItGoScans.kt b/multisrc/overrides/comicake/letitgoscans/src/LetItGoScans.kt similarity index 100% rename from multisrc/overrides/src/comicake/letitgoscans/LetItGoScans.kt rename to multisrc/overrides/comicake/letitgoscans/src/LetItGoScans.kt diff --git a/multisrc/overrides/res/comicake/whimsubs/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/comicake/whimsubs/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/whimsubs/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/comicake/whimsubs/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/whimsubs/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/comicake/whimsubs/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/whimsubs/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/comicake/whimsubs/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/whimsubs/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/comicake/whimsubs/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/whimsubs/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/comicake/whimsubs/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/whimsubs/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/comicake/whimsubs/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/whimsubs/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/comicake/whimsubs/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/whimsubs/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/comicake/whimsubs/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/comicake/whimsubs/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/comicake/whimsubs/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/comicake/whimsubs/web_hi_res_512.png b/multisrc/overrides/comicake/whimsubs/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/comicake/whimsubs/web_hi_res_512.png rename to multisrc/overrides/comicake/whimsubs/res/web_hi_res_512.png diff --git a/multisrc/overrides/res/genkan/default/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/genkan/default_res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/default/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/genkan/default_res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/default/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/genkan/default_res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/default/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/genkan/default_res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/default/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/genkan/default_res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/default/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/genkan/default_res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/default/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/genkan/default_res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/default/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/default_res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/default/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/genkan/default_res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/default/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/default_res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/default/web_hi_res_512.png b/multisrc/overrides/genkan/default_res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/genkan/default/web_hi_res_512.png rename to multisrc/overrides/genkan/default_res/web_hi_res_512.png diff --git a/multisrc/overrides/res/genkan/edelgardescans/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/genkan/edelgardescans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/edelgardescans/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/genkan/edelgardescans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/edelgardescans/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/genkan/edelgardescans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/edelgardescans/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/genkan/edelgardescans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/edelgardescans/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/genkan/edelgardescans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/edelgardescans/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/genkan/edelgardescans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/edelgardescans/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/genkan/edelgardescans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/edelgardescans/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/edelgardescans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/edelgardescans/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/genkan/edelgardescans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/edelgardescans/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/edelgardescans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/edelgardescans/web_hi_res_512.png b/multisrc/overrides/genkan/edelgardescans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/genkan/edelgardescans/web_hi_res_512.png rename to multisrc/overrides/genkan/edelgardescans/res/web_hi_res_512.png diff --git a/multisrc/overrides/res/genkan/hatigarmscans/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/genkan/hatigarmscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/hatigarmscans/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/genkan/hatigarmscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/hatigarmscans/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/genkan/hatigarmscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/hatigarmscans/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/genkan/hatigarmscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/hatigarmscans/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/genkan/hatigarmscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/hatigarmscans/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/genkan/hatigarmscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/hatigarmscans/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/genkan/hatigarmscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/hatigarmscans/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/hatigarmscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/hatigarmscans/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/genkan/hatigarmscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/hatigarmscans/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/hatigarmscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/hatigarmscans/web_hi_res_512.png b/multisrc/overrides/genkan/hatigarmscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/genkan/hatigarmscans/web_hi_res_512.png rename to multisrc/overrides/genkan/hatigarmscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/src/genkan/hatigarmscans/HatigarmScans.kt b/multisrc/overrides/genkan/hatigarmscans/src/HatigarmScans.kt similarity index 100% rename from multisrc/overrides/src/genkan/hatigarmscans/HatigarmScans.kt rename to multisrc/overrides/genkan/hatigarmscans/src/HatigarmScans.kt diff --git a/multisrc/overrides/res/genkan/hunlightscans/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/genkan/hunlightscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/hunlightscans/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/genkan/hunlightscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/hunlightscans/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/genkan/hunlightscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/hunlightscans/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/genkan/hunlightscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/hunlightscans/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/genkan/hunlightscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/hunlightscans/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/genkan/hunlightscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/hunlightscans/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/genkan/hunlightscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/hunlightscans/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/hunlightscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/hunlightscans/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/genkan/hunlightscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/hunlightscans/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/hunlightscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/hunlightscans/web_hi_res_512.png b/multisrc/overrides/genkan/hunlightscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/genkan/hunlightscans/web_hi_res_512.png rename to multisrc/overrides/genkan/hunlightscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/res/genkan/leviatanscans/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/genkan/leviatanscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/leviatanscans/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/genkan/leviatanscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/leviatanscans/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/genkan/leviatanscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/leviatanscans/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/genkan/leviatanscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/leviatanscans/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/genkan/leviatanscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/leviatanscans/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/genkan/leviatanscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/leviatanscans/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/genkan/leviatanscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/leviatanscans/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/leviatanscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/leviatanscans/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/genkan/leviatanscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/leviatanscans/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/leviatanscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/leviatanscans/web_hi_res_512.png b/multisrc/overrides/genkan/leviatanscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/genkan/leviatanscans/web_hi_res_512.png rename to multisrc/overrides/genkan/leviatanscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/src/genkan/leviatanscans/LeviatanScansFactory.kt b/multisrc/overrides/genkan/leviatanscans/src/LeviatanScansFactory.kt similarity index 100% rename from multisrc/overrides/src/genkan/leviatanscans/LeviatanScansFactory.kt rename to multisrc/overrides/genkan/leviatanscans/src/LeviatanScansFactory.kt diff --git a/multisrc/overrides/res/genkan/methodscans/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/genkan/methodscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/methodscans/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/genkan/methodscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/methodscans/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/genkan/methodscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/methodscans/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/genkan/methodscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/methodscans/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/genkan/methodscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/methodscans/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/genkan/methodscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/methodscans/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/genkan/methodscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/methodscans/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/methodscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/methodscans/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/genkan/methodscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/methodscans/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/methodscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/methodscans/web_hi_res_512.png b/multisrc/overrides/genkan/methodscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/genkan/methodscans/web_hi_res_512.png rename to multisrc/overrides/genkan/methodscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/res/genkan/reaperscans/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/genkan/reaperscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/reaperscans/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/genkan/reaperscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/reaperscans/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/genkan/reaperscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/reaperscans/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/genkan/reaperscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/reaperscans/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/genkan/reaperscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/reaperscans/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/genkan/reaperscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/reaperscans/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/genkan/reaperscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/reaperscans/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/reaperscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/reaperscans/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/genkan/reaperscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/reaperscans/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/reaperscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/reaperscans/web_hi_res_512.png b/multisrc/overrides/genkan/reaperscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/genkan/reaperscans/web_hi_res_512.png rename to multisrc/overrides/genkan/reaperscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/res/genkan/secretscans/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/genkan/secretscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/secretscans/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/genkan/secretscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/secretscans/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/genkan/secretscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/secretscans/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/genkan/secretscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/secretscans/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/genkan/secretscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/secretscans/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/genkan/secretscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/secretscans/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/genkan/secretscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/secretscans/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/secretscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/secretscans/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/genkan/secretscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/secretscans/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/secretscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/secretscans/web_hi_res_512.png b/multisrc/overrides/genkan/secretscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/genkan/secretscans/web_hi_res_512.png rename to multisrc/overrides/genkan/secretscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/res/genkan/sleepingknightscans/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/genkan/sleepingknightscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/sleepingknightscans/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/genkan/sleepingknightscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/sleepingknightscans/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/genkan/sleepingknightscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/sleepingknightscans/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/genkan/sleepingknightscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/sleepingknightscans/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/genkan/sleepingknightscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/sleepingknightscans/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/genkan/sleepingknightscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/sleepingknightscans/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/genkan/sleepingknightscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/sleepingknightscans/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/sleepingknightscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/sleepingknightscans/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/genkan/sleepingknightscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/sleepingknightscans/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/sleepingknightscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/sleepingknightscans/web_hi_res_512.png b/multisrc/overrides/genkan/sleepingknightscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/genkan/sleepingknightscans/web_hi_res_512.png rename to multisrc/overrides/genkan/sleepingknightscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/res/genkan/thenonamesscans/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/genkan/thenonamesscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/thenonamesscans/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/genkan/thenonamesscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/thenonamesscans/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/genkan/thenonamesscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/thenonamesscans/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/genkan/thenonamesscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/thenonamesscans/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/genkan/thenonamesscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/thenonamesscans/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/genkan/thenonamesscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/thenonamesscans/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/genkan/thenonamesscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/thenonamesscans/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/thenonamesscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/thenonamesscans/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/genkan/thenonamesscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/thenonamesscans/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/thenonamesscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/thenonamesscans/web_hi_res_512.png b/multisrc/overrides/genkan/thenonamesscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/genkan/thenonamesscans/web_hi_res_512.png rename to multisrc/overrides/genkan/thenonamesscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/res/genkan/zeroscans/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/genkan/zeroscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/zeroscans/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/genkan/zeroscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/zeroscans/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/genkan/zeroscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/zeroscans/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/genkan/zeroscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/zeroscans/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/genkan/zeroscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/zeroscans/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/genkan/zeroscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/zeroscans/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/genkan/zeroscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/zeroscans/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/zeroscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/zeroscans/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/genkan/zeroscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/genkan/zeroscans/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/zeroscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/genkan/zeroscans/web_hi_res_512.png b/multisrc/overrides/genkan/zeroscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/genkan/zeroscans/web_hi_res_512.png rename to multisrc/overrides/genkan/zeroscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/src/madara/adonisfansub/AdonisFansub.kt b/multisrc/overrides/madara/adonisfansub/src/AdonisFansub.kt similarity index 100% rename from multisrc/overrides/src/madara/adonisfansub/AdonisFansub.kt rename to multisrc/overrides/madara/adonisfansub/src/AdonisFansub.kt diff --git a/multisrc/overrides/src/madara/agentofchangetranslations/AgentofChangeTranslations.kt b/multisrc/overrides/madara/agentofchangetranslations/src/AgentofChangeTranslations.kt similarity index 100% rename from multisrc/overrides/src/madara/agentofchangetranslations/AgentofChangeTranslations.kt rename to multisrc/overrides/madara/agentofchangetranslations/src/AgentofChangeTranslations.kt diff --git a/multisrc/overrides/src/madara/allporncomic/AllPornComic.kt b/multisrc/overrides/madara/allporncomic/src/AllPornComic.kt similarity index 100% rename from multisrc/overrides/src/madara/allporncomic/AllPornComic.kt rename to multisrc/overrides/madara/allporncomic/src/AllPornComic.kt diff --git a/multisrc/overrides/src/madara/aloalivn/Aloalivn.kt b/multisrc/overrides/madara/aloalivn/src/Aloalivn.kt similarity index 100% rename from multisrc/overrides/src/madara/aloalivn/Aloalivn.kt rename to multisrc/overrides/madara/aloalivn/src/Aloalivn.kt diff --git a/multisrc/overrides/src/madara/animangaes/AniMangaEs.kt b/multisrc/overrides/madara/animangaes/src/AniMangaEs.kt similarity index 100% rename from multisrc/overrides/src/madara/animangaes/AniMangaEs.kt rename to multisrc/overrides/madara/animangaes/src/AniMangaEs.kt diff --git a/multisrc/overrides/src/madara/apollcomics/ApollComics.kt b/multisrc/overrides/madara/apollcomics/src/ApollComics.kt similarity index 100% rename from multisrc/overrides/src/madara/apollcomics/ApollComics.kt rename to multisrc/overrides/madara/apollcomics/src/ApollComics.kt diff --git a/multisrc/overrides/src/madara/arangscans/ArangScans.kt b/multisrc/overrides/madara/arangscans/src/ArangScans.kt similarity index 100% rename from multisrc/overrides/src/madara/arangscans/ArangScans.kt rename to multisrc/overrides/madara/arangscans/src/ArangScans.kt diff --git a/multisrc/overrides/src/madara/araznovel/ArazNovel.kt b/multisrc/overrides/madara/araznovel/src/ArazNovel.kt similarity index 100% rename from multisrc/overrides/src/madara/araznovel/ArazNovel.kt rename to multisrc/overrides/madara/araznovel/src/ArazNovel.kt diff --git a/multisrc/overrides/src/madara/argosscan/ArgosScan.kt b/multisrc/overrides/madara/argosscan/src/ArgosScan.kt similarity index 100% rename from multisrc/overrides/src/madara/argosscan/ArgosScan.kt rename to multisrc/overrides/madara/argosscan/src/ArgosScan.kt diff --git a/multisrc/overrides/src/madara/astrallibrary/AstralLibrary.kt b/multisrc/overrides/madara/astrallibrary/src/AstralLibrary.kt similarity index 100% rename from multisrc/overrides/src/madara/astrallibrary/AstralLibrary.kt rename to multisrc/overrides/madara/astrallibrary/src/AstralLibrary.kt diff --git a/multisrc/overrides/src/madara/atikrost/Atikrost.kt b/multisrc/overrides/madara/atikrost/src/Atikrost.kt similarity index 100% rename from multisrc/overrides/src/madara/atikrost/Atikrost.kt rename to multisrc/overrides/madara/atikrost/src/Atikrost.kt diff --git a/multisrc/overrides/src/madara/atmsubs/ATMSubs.kt b/multisrc/overrides/madara/atmsubs/src/ATMSubs.kt similarity index 100% rename from multisrc/overrides/src/madara/atmsubs/ATMSubs.kt rename to multisrc/overrides/madara/atmsubs/src/ATMSubs.kt diff --git a/multisrc/overrides/src/madara/azora/Azora.kt b/multisrc/overrides/madara/azora/src/Azora.kt similarity index 100% rename from multisrc/overrides/src/madara/azora/Azora.kt rename to multisrc/overrides/madara/azora/src/Azora.kt diff --git a/multisrc/overrides/src/madara/bestmanga/BestManga.kt b/multisrc/overrides/madara/bestmanga/src/BestManga.kt similarity index 100% rename from multisrc/overrides/src/madara/bestmanga/BestManga.kt rename to multisrc/overrides/madara/bestmanga/src/BestManga.kt diff --git a/multisrc/overrides/src/madara/cattranslator/CatTranslator.kt b/multisrc/overrides/madara/cattranslator/src/CatTranslator.kt similarity index 100% rename from multisrc/overrides/src/madara/cattranslator/CatTranslator.kt rename to multisrc/overrides/madara/cattranslator/src/CatTranslator.kt diff --git a/multisrc/overrides/src/madara/chibimanga/ChibiManga.kt b/multisrc/overrides/madara/chibimanga/src/ChibiManga.kt similarity index 100% rename from multisrc/overrides/src/madara/chibimanga/ChibiManga.kt rename to multisrc/overrides/madara/chibimanga/src/ChibiManga.kt diff --git a/multisrc/overrides/src/madara/clovermanga/CloverManga.kt b/multisrc/overrides/madara/clovermanga/src/CloverManga.kt similarity index 100% rename from multisrc/overrides/src/madara/clovermanga/CloverManga.kt rename to multisrc/overrides/madara/clovermanga/src/CloverManga.kt diff --git a/multisrc/overrides/src/madara/comickiba/ComicKiba.kt b/multisrc/overrides/madara/comickiba/src/ComicKiba.kt similarity index 100% rename from multisrc/overrides/src/madara/comickiba/ComicKiba.kt rename to multisrc/overrides/madara/comickiba/src/ComicKiba.kt diff --git a/multisrc/overrides/src/madara/cutiepie/CutiePie.kt b/multisrc/overrides/madara/cutiepie/src/CutiePie.kt similarity index 100% rename from multisrc/overrides/src/madara/cutiepie/CutiePie.kt rename to multisrc/overrides/madara/cutiepie/src/CutiePie.kt diff --git a/multisrc/overrides/res/madara/default/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/default_res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/madara/default/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/madara/default_res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/madara/default/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/default_res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/madara/default/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/madara/default_res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/madara/default/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/default_res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/madara/default/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/madara/default_res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/madara/default/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/default_res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/madara/default/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/madara/default_res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/madara/default/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/default_res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/madara/default/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/madara/default_res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/madara/default/web_hi_res_512.png b/multisrc/overrides/madara/default_res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/madara/default/web_hi_res_512.png rename to multisrc/overrides/madara/default_res/web_hi_res_512.png diff --git a/multisrc/overrides/src/madara/diamondfansub/DiamondFansub.kt b/multisrc/overrides/madara/diamondfansub/src/DiamondFansub.kt similarity index 100% rename from multisrc/overrides/src/madara/diamondfansub/DiamondFansub.kt rename to multisrc/overrides/madara/diamondfansub/src/DiamondFansub.kt diff --git a/multisrc/overrides/src/madara/disasterscans/DisasterScans.kt b/multisrc/overrides/madara/disasterscans/src/DisasterScans.kt similarity index 100% rename from multisrc/overrides/src/madara/disasterscans/DisasterScans.kt rename to multisrc/overrides/madara/disasterscans/src/DisasterScans.kt diff --git a/multisrc/overrides/src/madara/doujinhentai/DoujinHentai.kt b/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt similarity index 100% rename from multisrc/overrides/src/madara/doujinhentai/DoujinHentai.kt rename to multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt diff --git a/multisrc/overrides/src/madara/doujinyosh/DoujinYosh.kt b/multisrc/overrides/madara/doujinyosh/src/DoujinYosh.kt similarity index 100% rename from multisrc/overrides/src/madara/doujinyosh/DoujinYosh.kt rename to multisrc/overrides/madara/doujinyosh/src/DoujinYosh.kt diff --git a/multisrc/overrides/src/madara/dropescan/DropeScan.kt b/multisrc/overrides/madara/dropescan/src/DropeScan.kt similarity index 100% rename from multisrc/overrides/src/madara/dropescan/DropeScan.kt rename to multisrc/overrides/madara/dropescan/src/DropeScan.kt diff --git a/multisrc/overrides/src/madara/fdmscan/FDMScan.kt b/multisrc/overrides/madara/fdmscan/src/FDMScan.kt similarity index 100% rename from multisrc/overrides/src/madara/fdmscan/FDMScan.kt rename to multisrc/overrides/madara/fdmscan/src/FDMScan.kt diff --git a/multisrc/overrides/src/madara/firstkissmanga/FirstKissManga.kt b/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt similarity index 100% rename from multisrc/overrides/src/madara/firstkissmanga/FirstKissManga.kt rename to multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt diff --git a/multisrc/overrides/src/madara/firstkissmanhua/FirstKissManhua.kt b/multisrc/overrides/madara/firstkissmanhua/src/FirstKissManhua.kt similarity index 100% rename from multisrc/overrides/src/madara/firstkissmanhua/FirstKissManhua.kt rename to multisrc/overrides/madara/firstkissmanhua/src/FirstKissManhua.kt diff --git a/multisrc/overrides/src/madara/furioscans/FurioScans.kt b/multisrc/overrides/madara/furioscans/src/FurioScans.kt similarity index 100% rename from multisrc/overrides/src/madara/furioscans/FurioScans.kt rename to multisrc/overrides/madara/furioscans/src/FurioScans.kt diff --git a/multisrc/overrides/src/madara/geceninlordu/GeceninLordu.kt b/multisrc/overrides/madara/geceninlordu/src/GeceninLordu.kt similarity index 100% rename from multisrc/overrides/src/madara/geceninlordu/GeceninLordu.kt rename to multisrc/overrides/madara/geceninlordu/src/GeceninLordu.kt diff --git a/multisrc/overrides/src/madara/goldenmanga/GoldenManga.kt b/multisrc/overrides/madara/goldenmanga/src/GoldenManga.kt similarity index 100% rename from multisrc/overrides/src/madara/goldenmanga/GoldenManga.kt rename to multisrc/overrides/madara/goldenmanga/src/GoldenManga.kt diff --git a/multisrc/overrides/src/madara/hikariscan/HikariScan.kt b/multisrc/overrides/madara/hikariscan/src/HikariScan.kt similarity index 100% rename from multisrc/overrides/src/madara/hikariscan/HikariScan.kt rename to multisrc/overrides/madara/hikariscan/src/HikariScan.kt diff --git a/multisrc/overrides/src/madara/himerafansub/HimeraFansub.kt b/multisrc/overrides/madara/himerafansub/src/HimeraFansub.kt similarity index 100% rename from multisrc/overrides/src/madara/himerafansub/HimeraFansub.kt rename to multisrc/overrides/madara/himerafansub/src/HimeraFansub.kt diff --git a/multisrc/overrides/src/madara/hiperdex/Hiperdex.kt b/multisrc/overrides/madara/hiperdex/src/Hiperdex.kt similarity index 100% rename from multisrc/overrides/src/madara/hiperdex/Hiperdex.kt rename to multisrc/overrides/madara/hiperdex/src/Hiperdex.kt diff --git a/multisrc/overrides/res/mangabox/default/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangabox/default_res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/default/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangabox/default_res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/default/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangabox/default_res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/default/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangabox/default_res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/default/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangabox/default_res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/default/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/default_res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/default/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/default_res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/default/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/default_res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/default/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/default_res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/default/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/default_res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/default/web_hi_res_512.png b/multisrc/overrides/mangabox/default_res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/mangabox/default/web_hi_res_512.png rename to multisrc/overrides/mangabox/default_res/web_hi_res_512.png diff --git a/multisrc/overrides/res/mangabox/mangabat/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangabat/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangabat/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangabat/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangabat/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangabat/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangabat/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangabat/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangabat/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangabat/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangabat/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangabat/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangabat/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangabat/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangabat/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangabat/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangabat/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangabat/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangabat/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangabat/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangabat/web_hi_res_512.png b/multisrc/overrides/mangabox/mangabat/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangabat/web_hi_res_512.png rename to multisrc/overrides/mangabox/mangabat/res/web_hi_res_512.png diff --git a/multisrc/overrides/src/mangabox/mangabat/Mangabat.kt b/multisrc/overrides/mangabox/mangabat/src/Mangabat.kt similarity index 100% rename from multisrc/overrides/src/mangabox/mangabat/Mangabat.kt rename to multisrc/overrides/mangabox/mangabat/src/Mangabat.kt diff --git a/multisrc/overrides/res/mangabox/mangairo/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangairo/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangairo/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangairo/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangairo/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangairo/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangairo/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangairo/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangairo/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangairo/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangairo/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangairo/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangairo/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangairo/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangairo/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangairo/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangairo/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangairo/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangairo/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangairo/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangairo/web_hi_res_512.png b/multisrc/overrides/mangabox/mangairo/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangairo/web_hi_res_512.png rename to multisrc/overrides/mangabox/mangairo/res/web_hi_res_512.png diff --git a/multisrc/overrides/src/mangabox/mangairo/Mangairo.kt b/multisrc/overrides/mangabox/mangairo/src/Mangairo.kt similarity index 100% rename from multisrc/overrides/src/mangabox/mangairo/Mangairo.kt rename to multisrc/overrides/mangabox/mangairo/src/Mangairo.kt diff --git a/multisrc/overrides/res/mangabox/mangakakalot/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakakalot/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakakalot/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakakalot/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakakalot/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakakalot/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakakalot/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakakalot/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakakalot/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakakalot/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakakalot/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakakalot/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakakalot/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakakalot/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakakalot/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakakalot/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakakalot/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakakalot/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakakalot/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakakalot/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakakalot/web_hi_res_512.png b/multisrc/overrides/mangabox/mangakakalot/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakakalot/web_hi_res_512.png rename to multisrc/overrides/mangabox/mangakakalot/res/web_hi_res_512.png diff --git a/multisrc/overrides/src/mangabox/mangakakalot/Mangakakalot.kt b/multisrc/overrides/mangabox/mangakakalot/src/Mangakakalot.kt similarity index 100% rename from multisrc/overrides/src/mangabox/mangakakalot/Mangakakalot.kt rename to multisrc/overrides/mangabox/mangakakalot/src/Mangakakalot.kt diff --git a/multisrc/overrides/res/mangabox/mangakakalots/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakakalots/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakakalots/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakakalots/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakakalots/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakakalots/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakakalots/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakakalots/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakakalots/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakakalots/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakakalots/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakakalots/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakakalots/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakakalots/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakakalots/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakakalots/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakakalots/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakakalots/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakakalots/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakakalots/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakakalots/web_hi_res_512.png b/multisrc/overrides/mangabox/mangakakalots/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakakalots/web_hi_res_512.png rename to multisrc/overrides/mangabox/mangakakalots/res/web_hi_res_512.png diff --git a/multisrc/overrides/src/mangabox/mangakakalots/Mangakakalots.kt b/multisrc/overrides/mangabox/mangakakalots/src/Mangakakalots.kt similarity index 100% rename from multisrc/overrides/src/mangabox/mangakakalots/Mangakakalots.kt rename to multisrc/overrides/mangabox/mangakakalots/src/Mangakakalots.kt diff --git a/multisrc/overrides/res/mangabox/mangakita/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakita/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakita/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakita/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakita/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakita/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakita/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakita/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakita/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakita/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakita/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakita/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakita/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakita/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakita/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakita/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakita/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/mangakita/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakita/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/mangakita/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/mangakita/web_hi_res_512.png b/multisrc/overrides/mangabox/mangakita/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/mangabox/mangakita/web_hi_res_512.png rename to multisrc/overrides/mangabox/mangakita/res/web_hi_res_512.png diff --git a/multisrc/overrides/res/mangabox/manganelo/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangabox/manganelo/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/manganelo/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangabox/manganelo/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/manganelo/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangabox/manganelo/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/manganelo/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangabox/manganelo/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/manganelo/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangabox/manganelo/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/manganelo/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/manganelo/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/manganelo/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/manganelo/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/manganelo/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/manganelo/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/manganelo/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/manganelo/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/res/mangabox/manganelo/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/manganelo/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/res/mangabox/manganelo/web_hi_res_512.png b/multisrc/overrides/mangabox/manganelo/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/res/mangabox/manganelo/web_hi_res_512.png rename to multisrc/overrides/mangabox/manganelo/res/web_hi_res_512.png diff --git a/multisrc/overrides/src/mangabox/manganelo/Manganelo.kt b/multisrc/overrides/mangabox/manganelo/src/Manganelo.kt similarity index 100% rename from multisrc/overrides/src/mangabox/manganelo/Manganelo.kt rename to multisrc/overrides/mangabox/manganelo/src/Manganelo.kt diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt index a9134fb9f..84eb4c988 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt @@ -68,10 +68,10 @@ interface ThemeSourceGenerator { """.trimIndent()) } - private fun writeAndroidManifest(androidManifestFile: File, manifestOverridesPath: String, source: ThemeSourceData, projectRootPath: String) { - val androidManifestOverride = File("$manifestOverridesPath/${source.pkgName}") + private fun writeAndroidManifest(androidManifestFile: File, manifestOverridesPath: String) { + val androidManifestOverride = File(manifestOverridesPath) if (androidManifestOverride.exists()) - androidManifestOverride.copyRecursively(File(projectRootPath)) + androidManifestOverride.copyTo(androidManifestFile) else androidManifestFile.writeText(""" @@ -83,10 +83,11 @@ interface ThemeSourceGenerator { private fun createGradleProject(source: ThemeSourceData, themePkg: String, themeClass: String, baseVersionCode: Int, userDir: String) { val projectRootPath = "$userDir/generated-src/${pkgNameSuffix(source, "/")}" val projectSrcPath = "$projectRootPath/src/eu/kanade/tachiyomi/extension/${pkgNameSuffix(source, "/")}" - val overridesPath = "$userDir/multisrc/overrides" // userDir = tachiyomi-extensions project root path - val resOverridesPath = "$overridesPath/res/$themePkg" - val srcOverridesPath = "$overridesPath/src/$themePkg" - val manifestOverridesPath = "$overridesPath/manifest/$themePkg" + val overridesPath = "$userDir/multisrc/overrides/$themePkg/${source.pkgName}" // userDir = tachiyomi-extensions project root path + val defaultResPath = "$userDir/multisrc/overrides/$themePkg/default_res" + val resOverridesPath = "$overridesPath/res" + val srcOverridesPath = "$overridesPath/src" + val manifestOverridesPath = "$overridesPath/AndroidManifest.xml" val projectGradleFile = File("$projectRootPath/build.gradle") val projectAndroidManifestFile = File("$projectRootPath/AndroidManifest.xml") @@ -98,12 +99,12 @@ interface ThemeSourceGenerator { cleanDirectory(projectRootFile) writeGradle(projectGradleFile, source, baseVersionCode) - writeAndroidManifest(projectAndroidManifestFile, manifestOverridesPath, source, projectRootPath) + writeAndroidManifest(projectAndroidManifestFile, manifestOverridesPath) - writeSourceFiles(projectSrcPath, srcOverridesPath, source, themePkg, themeClass) + writeSourceClasses(projectSrcPath, srcOverridesPath, source, themePkg, themeClass) copyThemeClasses(userDir, themePkg, projectRootPath) - copyResFiles(resOverridesPath, source, projectRootPath) + copyResFiles(overridesPath, defaultResPath, source, projectRootPath) } } @@ -120,18 +121,18 @@ interface ThemeSourceGenerator { .forEach { Files.copy(File("$themeSrcPath/$it").toPath(), File("$themeDestPath/$it").toPath(), StandardCopyOption.REPLACE_EXISTING) } } - private fun copyResFiles(resOverridesPath: String, source: ThemeSourceData, projectRootPath: String): Any { + private fun copyResFiles(overridesPath: String, defaultResPath: String, source: ThemeSourceData, projectRootPath: String): Any { // check if res override exists if not copy default res - val resOverride = File("$resOverridesPath/${source.pkgName}") + val resOverride = File("$overridesPath/res") return if (resOverride.exists()) resOverride.copyRecursively(File("$projectRootPath/res")) else - File("$resOverridesPath/default").let { res -> - if (res.exists()) res.copyRecursively(File("$projectRootPath/res")) + File(defaultResPath).let { defaultResFile -> + if (defaultResFile.exists()) defaultResFile.copyRecursively(File("$projectRootPath/res")) } } - private fun writeSourceFiles(projectSrcPath: String, srcOverridePath: String, source: ThemeSourceData, themePkg: String, themeClass: String) { + private fun writeSourceClasses(projectSrcPath: String, srcOverridePath: String, source: ThemeSourceData, themePkg: String, themeClass: String) { val projectSrcFile = File(projectSrcPath) projectSrcFile.mkdirs() val srcOverride = File("$srcOverridePath/${source.pkgName}")