diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3ee4d61fa3..1750bffd4e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -144,7 +144,7 @@ android {
 }
 
 dependencies {
-    implementation(projects.core)
+    implementation(projects.core.main)
     implementation(projects.data)
     implementation(projects.domain)
     implementation(projects.i18n)
diff --git a/core/build.gradle.kts b/core/main/build.gradle.kts
similarity index 100%
rename from core/build.gradle.kts
rename to core/main/build.gradle.kts
diff --git a/core/src/androidMain/AndroidManifest.xml b/core/main/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from core/src/androidMain/AndroidManifest.xml
rename to core/main/src/androidMain/AndroidManifest.xml
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/core/preference/AndroidPreference.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/core/preference/AndroidPreference.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/core/preference/AndroidPreference.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/core/preference/AndroidPreference.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/core/preference/AndroidPreferenceStore.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/core/preference/AndroidPreferenceStore.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/core/preference/AndroidPreferenceStore.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/core/preference/AndroidPreferenceStore.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/AndroidCookieJar.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/AndroidCookieJar.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/AndroidCookieJar.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/AndroidCookieJar.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/DohProviders.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/DohProviders.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/DohProviders.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/DohProviders.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/ProgressResponseBody.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/ProgressResponseBody.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/ProgressResponseBody.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/ProgressResponseBody.kt
index 72248f17b7..996eba684d 100644
--- a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/ProgressResponseBody.kt
+++ b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/ProgressResponseBody.kt
@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.network
 
+import java.io.IOException
 import okhttp3.MediaType
 import okhttp3.ResponseBody
 import okio.Buffer
@@ -7,7 +8,6 @@ import okio.BufferedSource
 import okio.ForwardingSource
 import okio.Source
 import okio.buffer
-import java.io.IOException
 
 class ProgressResponseBody(private val responseBody: ResponseBody, private val progressListener: ProgressListener) : ResponseBody() {
 
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/Requests.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/Requests.kt
similarity index 97%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/Requests.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/Requests.kt
index dedc62fea3..c236a87960 100644
--- a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/Requests.kt
+++ b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/Requests.kt
@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.network
 
+import java.util.concurrent.TimeUnit.MINUTES
 import okhttp3.CacheControl
 import okhttp3.FormBody
 import okhttp3.Headers
@@ -7,7 +8,6 @@ import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.RequestBody
-import java.util.concurrent.TimeUnit.*
 
 private val DEFAULT_CACHE_CONTROL = CacheControl.Builder().maxAge(10, MINUTES).build()
 private val DEFAULT_HEADERS = Headers.Builder().build()
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/IgnoreGzipInterceptor.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/IgnoreGzipInterceptor.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/IgnoreGzipInterceptor.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/IgnoreGzipInterceptor.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt
similarity index 98%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt
index e059f2b742..301c5259bb 100644
--- a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt
+++ b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt
@@ -1,11 +1,11 @@
 package eu.kanade.tachiyomi.network.interceptor
 
 import android.os.SystemClock
+import java.io.IOException
+import java.util.concurrent.TimeUnit
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Response
-import java.io.IOException
-import java.util.concurrent.*
 
 /**
  * An OkHttp interceptor that handles rate limiting.
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt
similarity index 98%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt
index a1307de1f7..1b52525ca0 100644
--- a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt
+++ b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt
@@ -1,12 +1,12 @@
 package eu.kanade.tachiyomi.network.interceptor
 
 import android.os.SystemClock
+import java.io.IOException
+import java.util.concurrent.TimeUnit
 import okhttp3.HttpUrl
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Response
-import java.io.IOException
-import java.util.concurrent.*
 
 /**
  * An OkHttp interceptor that handles given url host's rate limiting.
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/UncaughtExceptionInterceptor.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/UncaughtExceptionInterceptor.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/UncaughtExceptionInterceptor.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/UncaughtExceptionInterceptor.kt
index 1de824381b..2124e6ffd2 100644
--- a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/UncaughtExceptionInterceptor.kt
+++ b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/UncaughtExceptionInterceptor.kt
@@ -1,8 +1,8 @@
 package eu.kanade.tachiyomi.network.interceptor
 
+import java.io.IOException
 import okhttp3.Interceptor
 import okhttp3.Response
-import java.io.IOException
 
 /**
  * Catches any uncaught exceptions from later in the chain and rethrows as a non-fatal
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/UserAgentInterceptor.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/UserAgentInterceptor.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/UserAgentInterceptor.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/UserAgentInterceptor.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt
similarity index 97%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt
index 47018c7443..edfb857203 100644
--- a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt
+++ b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt
@@ -10,13 +10,14 @@ import eu.kanade.tachiyomi.util.system.WebViewUtil
 import eu.kanade.tachiyomi.util.system.launchUI
 import eu.kanade.tachiyomi.util.system.setDefaultSettings
 import eu.kanade.tachiyomi.util.system.toast
+import java.util.Locale
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
 import okhttp3.Headers
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
 import yokai.i18n.MR
-import java.util.*
-import java.util.concurrent.*
 
 abstract class WebViewInterceptor(
     private val context: Context,
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/DensityExtensions.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/DensityExtensions.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/DensityExtensions.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/DensityExtensions.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/DeviceUtil.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/DeviceUtil.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/DeviceUtil.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/DeviceUtil.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt
similarity index 94%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt
index 2b674180e0..d2eccb8e30 100644
--- a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt
+++ b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt
@@ -5,7 +5,6 @@ import android.widget.Toast
 import androidx.annotation.StringRes
 import dev.icerock.moko.resources.StringResource
 import yokai.util.lang.getString
-import dev.icerock.moko.resources.compose.stringResource
 
 /**
  * Display a toast in this context.
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/UniFileExtensions.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/UniFileExtensions.kt
similarity index 97%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/UniFileExtensions.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/UniFileExtensions.kt
index 4c8cc9975c..ce50162b3e 100644
--- a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/UniFileExtensions.kt
+++ b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/UniFileExtensions.kt
@@ -7,7 +7,6 @@ import android.os.ParcelFileDescriptor
 import com.hippo.unifile.UniFile
 import java.io.BufferedOutputStream
 import java.io.File
-import java.nio.channels.SeekableByteChannel
 
 val UniFile.nameWithoutExtension: String?
     get() = name?.substringBeforeLast('.')
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/WebViewClientCompat.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/WebViewClientCompat.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/WebViewClientCompat.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/WebViewClientCompat.kt
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/WebViewUtil.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/WebViewUtil.kt
similarity index 100%
rename from core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/WebViewUtil.kt
rename to core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/WebViewUtil.kt
diff --git a/core/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveInputStream.kt b/core/main/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveInputStream.kt
similarity index 100%
rename from core/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveInputStream.kt
rename to core/main/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveInputStream.kt
index fb5426f46a..abe8da941b 100644
--- a/core/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveInputStream.kt
+++ b/core/main/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveInputStream.kt
@@ -1,10 +1,10 @@
 package yokai.core.archive
 
+import java.nio.ByteBuffer
+import kotlin.concurrent.Volatile
 import me.zhanghai.android.libarchive.Archive
 import me.zhanghai.android.libarchive.ArchiveEntry
 import me.zhanghai.android.libarchive.ArchiveException
-import java.nio.ByteBuffer
-import kotlin.concurrent.Volatile
 
 class AndroidArchiveInputStream(buffer: Long, size: Long) : ArchiveInputStream() {
     private val lock = Any()
diff --git a/core/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveReader.kt b/core/main/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveReader.kt
similarity index 100%
rename from core/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveReader.kt
rename to core/main/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveReader.kt
index 8309e9b1a6..aee82a81fb 100644
--- a/core/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveReader.kt
+++ b/core/main/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveReader.kt
@@ -6,8 +6,8 @@ import android.system.Os
 import android.system.OsConstants
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.system.openFileDescriptor
-import me.zhanghai.android.libarchive.ArchiveException
 import java.io.InputStream
+import me.zhanghai.android.libarchive.ArchiveException
 
 class AndroidArchiveReader(pfd: ParcelFileDescriptor) : ArchiveReader {
     val size = pfd.statSize
diff --git a/core/src/androidMain/kotlin/yokai/core/archive/ArchiveEntry.kt b/core/main/src/androidMain/kotlin/yokai/core/archive/ArchiveEntry.kt
similarity index 100%
rename from core/src/androidMain/kotlin/yokai/core/archive/ArchiveEntry.kt
rename to core/main/src/androidMain/kotlin/yokai/core/archive/ArchiveEntry.kt
diff --git a/core/src/androidMain/kotlin/yokai/core/archive/ArchiveInputStream.kt b/core/main/src/androidMain/kotlin/yokai/core/archive/ArchiveInputStream.kt
similarity index 100%
rename from core/src/androidMain/kotlin/yokai/core/archive/ArchiveInputStream.kt
rename to core/main/src/androidMain/kotlin/yokai/core/archive/ArchiveInputStream.kt
diff --git a/core/src/androidMain/kotlin/yokai/core/archive/ArchiveReader.kt b/core/main/src/androidMain/kotlin/yokai/core/archive/ArchiveReader.kt
similarity index 100%
rename from core/src/androidMain/kotlin/yokai/core/archive/ArchiveReader.kt
rename to core/main/src/androidMain/kotlin/yokai/core/archive/ArchiveReader.kt
diff --git a/core/src/androidMain/kotlin/yokai/core/archive/ZipWriter.kt b/core/main/src/androidMain/kotlin/yokai/core/archive/ZipWriter.kt
similarity index 100%
rename from core/src/androidMain/kotlin/yokai/core/archive/ZipWriter.kt
rename to core/main/src/androidMain/kotlin/yokai/core/archive/ZipWriter.kt
index dd105245d6..a5d84edcfb 100644
--- a/core/src/androidMain/kotlin/yokai/core/archive/ZipWriter.kt
+++ b/core/main/src/androidMain/kotlin/yokai/core/archive/ZipWriter.kt
@@ -5,11 +5,11 @@ import android.system.Os
 import android.system.StructStat
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.system.openFileDescriptor
+import java.io.Closeable
+import java.nio.ByteBuffer
 import me.zhanghai.android.libarchive.Archive
 import me.zhanghai.android.libarchive.ArchiveEntry
 import me.zhanghai.android.libarchive.ArchiveException
-import java.io.Closeable
-import java.nio.ByteBuffer
 
 class ZipWriter(val context: Context, file: UniFile) : Closeable {
     private val pfd = file.openFileDescriptor(context, "wt")
diff --git a/core/src/androidMain/kotlin/yokai/util/lang/RxCoroutineBridge.kt b/core/main/src/androidMain/kotlin/yokai/util/lang/RxCoroutineBridge.kt
similarity index 100%
rename from core/src/androidMain/kotlin/yokai/util/lang/RxCoroutineBridge.kt
rename to core/main/src/androidMain/kotlin/yokai/util/lang/RxCoroutineBridge.kt
index a4909a77ba..16a3dade17 100644
--- a/core/src/androidMain/kotlin/yokai/util/lang/RxCoroutineBridge.kt
+++ b/core/main/src/androidMain/kotlin/yokai/util/lang/RxCoroutineBridge.kt
@@ -1,5 +1,8 @@
 package yokai.util.lang
 
+import kotlin.coroutines.cancellation.CancellationException
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -12,9 +15,6 @@ import rx.Emitter
 import rx.Observable
 import rx.Subscriber
 import rx.Subscription
-import kotlin.coroutines.cancellation.CancellationException
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 /*
  * Util functions for bridging RxJava and coroutines. Taken from TachiyomiEH/SY.
diff --git a/core/src/commonMain/kotlin/eu/kanade/tachiyomi/core/preference/Preference.kt b/core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/core/preference/Preference.kt
similarity index 100%
rename from core/src/commonMain/kotlin/eu/kanade/tachiyomi/core/preference/Preference.kt
rename to core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/core/preference/Preference.kt
diff --git a/core/src/commonMain/kotlin/eu/kanade/tachiyomi/core/preference/PreferenceStore.kt b/core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/core/preference/PreferenceStore.kt
similarity index 100%
rename from core/src/commonMain/kotlin/eu/kanade/tachiyomi/core/preference/PreferenceStore.kt
rename to core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/core/preference/PreferenceStore.kt
diff --git a/core/src/commonMain/kotlin/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt b/core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt
similarity index 100%
rename from core/src/commonMain/kotlin/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt
rename to core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt
diff --git a/core/src/commonMain/kotlin/eu/kanade/tachiyomi/network/NetworkPreferences.kt b/core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/network/NetworkPreferences.kt
similarity index 100%
rename from core/src/commonMain/kotlin/eu/kanade/tachiyomi/network/NetworkPreferences.kt
rename to core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/network/NetworkPreferences.kt
diff --git a/core/src/commonMain/kotlin/eu/kanade/tachiyomi/network/ProgressListener.kt b/core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/network/ProgressListener.kt
similarity index 100%
rename from core/src/commonMain/kotlin/eu/kanade/tachiyomi/network/ProgressListener.kt
rename to core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/network/ProgressListener.kt
diff --git a/core/src/commonMain/kotlin/eu/kanade/tachiyomi/util/system/CoroutinesExtensions.kt b/core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/util/system/CoroutinesExtensions.kt
similarity index 98%
rename from core/src/commonMain/kotlin/eu/kanade/tachiyomi/util/system/CoroutinesExtensions.kt
rename to core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/util/system/CoroutinesExtensions.kt
index d4989d31e9..4bb5215d2f 100644
--- a/core/src/commonMain/kotlin/eu/kanade/tachiyomi/util/system/CoroutinesExtensions.kt
+++ b/core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/util/system/CoroutinesExtensions.kt
@@ -5,7 +5,6 @@ import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.IO
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
diff --git a/core/src/commonMain/kotlin/eu/kanade/tachiyomi/util/system/KermitExtensions.kt b/core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/util/system/KermitExtensions.kt
similarity index 100%
rename from core/src/commonMain/kotlin/eu/kanade/tachiyomi/util/system/KermitExtensions.kt
rename to core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/util/system/KermitExtensions.kt
diff --git a/core/src/iosMain/kotlin/eu/kanade/tachiyomi/core/preference/DarwinPreference.kt b/core/main/src/iosMain/kotlin/eu/kanade/tachiyomi/core/preference/DarwinPreference.kt
similarity index 100%
rename from core/src/iosMain/kotlin/eu/kanade/tachiyomi/core/preference/DarwinPreference.kt
rename to core/main/src/iosMain/kotlin/eu/kanade/tachiyomi/core/preference/DarwinPreference.kt
diff --git a/core/src/iosMain/kotlin/eu/kanade/tachiyomi/core/preference/DarwinPreferenceStore.kt b/core/main/src/iosMain/kotlin/eu/kanade/tachiyomi/core/preference/DarwinPreferenceStore.kt
similarity index 100%
rename from core/src/iosMain/kotlin/eu/kanade/tachiyomi/core/preference/DarwinPreferenceStore.kt
rename to core/main/src/iosMain/kotlin/eu/kanade/tachiyomi/core/preference/DarwinPreferenceStore.kt
diff --git a/presentation/widget/build.gradle.kts b/presentation/widget/build.gradle.kts
index aa44817507..def28f0709 100644
--- a/presentation/widget/build.gradle.kts
+++ b/presentation/widget/build.gradle.kts
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    implementation(projects.core)
+    implementation(projects.core.main)
     implementation(projects.data)
     implementation(projects.domain)
     implementation(projects.i18n)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1c0f8209f0..09869b29ff 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -31,7 +31,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 rootProject.name = "Yokai"
 include(":app")
-include(":core")
+include(":core:main")
 include(":data")
 include(":domain")
 include(":i18n")
diff --git a/source/api/build.gradle.kts b/source/api/build.gradle.kts
index 31f3f0856e..3e4b8dac0e 100644
--- a/source/api/build.gradle.kts
+++ b/source/api/build.gradle.kts
@@ -21,7 +21,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                implementation(projects.core)
+                implementation(projects.core.main)
                 api(androidx.preference)
 
                 // Workaround for https://youtrack.jetbrains.com/issue/KT-57605