diff --git a/.github/workflows/Update.yml b/.github/workflows/Update.yml
index fc06da00..0e4746cb 100644
--- a/.github/workflows/Update.yml
+++ b/.github/workflows/Update.yml
@@ -110,7 +110,7 @@ jobs:
           done
 
           # Query the GraphQL endpoint and save the result to a file
-          ./gradlew :data:graphql:downloadApolloSchema --endpoint='http://localhost:4567/api/graphql' --schema=data/graphql/src/commonMain/graphql/schema.graphqls
+          ./gradlew :data:downloadApolloSchema --endpoint='http://localhost:4567/api/graphql' --schema=data/src/commonMain/graphql/schema.graphqls
 
           # Kill the Java process
           kill $pid
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index bedd89ce..5c98f8a4 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id(libs.plugins.ksp.get().pluginId)
     id(libs.plugins.buildkonfig.get().pluginId)
     id(libs.plugins.kotlinter.get().pluginId)
-    id(libs.plugins.ktorfit.get().pluginId)
+    id(libs.plugins.apollo.get().pluginId)
 }
 
 kotlin {
@@ -120,3 +120,9 @@ buildkonfig {
 android {
     namespace = "ca.gosyer.jui.data"
 }
+
+apollo {
+    service("service") {
+        packageName.set("ca.gosyer.jui.data.graphql")
+    }
+}
diff --git a/data/graphql/build.gradle.kts b/data/graphql/build.gradle.kts
deleted file mode 100644
index 7f1ec838..00000000
--- a/data/graphql/build.gradle.kts
+++ /dev/null
@@ -1,98 +0,0 @@
-@Suppress("DSL_SCOPE_VIOLATION")
-plugins {
-    id(libs.plugins.kotlin.multiplatform.get().pluginId)
-    id(libs.plugins.kotlin.serialization.get().pluginId)
-    id(libs.plugins.android.library.get().pluginId)
-    id(libs.plugins.apollo.get().pluginId)
-}
-
-kotlin {
-    androidTarget {
-        compilations {
-            all {
-                kotlinOptions.jvmTarget = Config.androidJvmTarget.toString()
-            }
-        }
-    }
-    jvm("desktop") {
-        compilations {
-            all {
-                kotlinOptions.jvmTarget = Config.desktopJvmTarget.toString()
-            }
-        }
-    }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
-
-    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
-    applyHierarchyTemplate {
-        common {
-            group("jvm") {
-                withAndroidTarget()
-                withJvm()
-            }
-            group("ios") {
-                withIosX64()
-                withIosArm64()
-                withIosSimulatorArm64()
-            }
-        }
-    }
-
-    sourceSets {
-        all {
-            languageSettings {
-                optIn("kotlin.RequiresOptIn")
-                optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
-            }
-        }
-        val commonMain by getting {
-            dependencies {
-                api(libs.apollo)
-            }
-        }
-        val commonTest by getting {
-            dependencies {
-
-            }
-        }
-
-        val jvmMain by getting {
-            dependencies {
-                api(kotlin("stdlib-jdk8"))
-            }
-        }
-        val jvmTest by getting {
-            dependencies {
-                implementation(kotlin("test"))
-            }
-        }
-
-        val desktopMain by getting {
-        }
-        val desktopTest by getting {
-        }
-
-        val androidMain by getting {
-        }
-        val androidUnitTest by getting {
-        }
-
-        val iosMain by getting {
-        }
-        val iosTest by getting {
-        }
-    }
-}
-
-
-android {
-    namespace = "ca.gosyer.jui.data.graphql"
-}
-
-apollo {
-    service("service") {
-        packageName.set("ca.gosyer.jui.data.graphql")
-    }
-}
diff --git a/data/src/commonMain/graphql/Settings.graphql b/data/src/commonMain/graphql/Settings.graphql
new file mode 100644
index 00000000..4f576456
--- /dev/null
+++ b/data/src/commonMain/graphql/Settings.graphql
@@ -0,0 +1,46 @@
+query AllSettings {
+  settings {
+    autoDownloadNewChapters
+    autoDownloadNewChaptersLimit
+    backupInterval
+    backupPath
+    backupTTL
+    backupTime
+    basicAuthEnabled
+    basicAuthPassword
+    basicAuthUsername
+    debugLogsEnabled
+    downloadAsCbz
+    downloadsPath
+    electronPath
+    excludeCompleted
+    excludeEntryWithUnreadChapters
+    excludeNotStarted
+    excludeUnreadChapters
+    extensionRepos
+    flareSolverrEnabled
+    flareSolverrSessionName
+    flareSolverrSessionTtl
+    flareSolverrTimeout
+    flareSolverrUrl
+    globalUpdateInterval
+    gqlDebugLogsEnabled
+    initialOpenInBrowserEnabled
+    ip
+    localSourcePath
+    maxSourcesInParallel
+    port
+    socksProxyEnabled
+    socksProxyHost
+    socksProxyPassword
+    socksProxyPort
+    socksProxyUsername
+    socksProxyVersion
+    systemTrayEnabled
+    updateMangas
+    webUIChannel
+    webUIFlavor
+    webUIInterface
+    webUIUpdateCheckInterval
+  }
+}
diff --git a/data/graphql/src/commonMain/graphql/schema.graphqls b/data/src/commonMain/graphql/schema.graphqls
similarity index 100%
rename from data/graphql/src/commonMain/graphql/schema.graphqls
rename to data/src/commonMain/graphql/schema.graphqls
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f8b91fc8..6ce2ee83 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,7 +19,6 @@ rootProject.name = "Tachidesk-JUI"
 include("core")
 include("i18n")
 include("data")
-include("data:graphql")
 include("domain")
 include("ui-core")
 include("presentation")