diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 6ceb40d..757ac68 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -11,11 +11,11 @@ dependencies {
 gradlePlugin {
     plugins {
         register("androidHilt") {
-            id = "aidoc.android.hilt"
+            id = "cazait.android.hilt"
             implementationClass = "org.cazait.HiltAndroidPlugin"
         }
         register("kotlinHilt") {
-            id = "aidoc.kotlin.hilt"
+            id = "cazait.kotlin.hilt"
             implementationClass = "org.cazait.HiltKotlinPlugin"
         }
     }
diff --git a/build-logic/src/main/kotlin/cazait.android.application.gradle.kts b/build-logic/src/main/kotlin/cazait.android.application.gradle.kts
index 424d093..4eef66e 100644
--- a/build-logic/src/main/kotlin/cazait.android.application.gradle.kts
+++ b/build-logic/src/main/kotlin/cazait.android.application.gradle.kts
@@ -1,5 +1,5 @@
-import cazait.configureKotlinAndroid
-import cazait.configureHiltAndroid
+import org.cazait.configureKotlinAndroid
+import org.cazait.configureHiltAndroid
 
 plugins {
     id("com.android.application")
diff --git a/build-logic/src/main/kotlin/cazait.android.compose.gradle.kts b/build-logic/src/main/kotlin/cazait.android.compose.gradle.kts
index b15791a..3829608 100644
--- a/build-logic/src/main/kotlin/cazait.android.compose.gradle.kts
+++ b/build-logic/src/main/kotlin/cazait.android.compose.gradle.kts
@@ -1,3 +1,3 @@
-import cazait.configureComposeAndroid
+import org.cazait.configureComposeAndroid
 
 configureComposeAndroid()
diff --git a/build-logic/src/main/kotlin/cazait.android.feature.gradle.kts b/build-logic/src/main/kotlin/cazait.android.feature.gradle.kts
index 0892715..ba313ad 100644
--- a/build-logic/src/main/kotlin/cazait.android.feature.gradle.kts
+++ b/build-logic/src/main/kotlin/cazait.android.feature.gradle.kts
@@ -1,5 +1,5 @@
-import cazait.configureHiltAndroid
-import cazait.libs
+import org.cazait.configureHiltAndroid
+import org.cazait.libs
 
 plugins {
     id("cazait.android.library")
diff --git a/build-logic/src/main/kotlin/cazait.android.library.gradle.kts b/build-logic/src/main/kotlin/cazait.android.library.gradle.kts
index bbbfabd..4af992c 100644
--- a/build-logic/src/main/kotlin/cazait.android.library.gradle.kts
+++ b/build-logic/src/main/kotlin/cazait.android.library.gradle.kts
@@ -1,7 +1,7 @@
-import cazait.configureCoroutineAndroid
-import cazait.configureHiltAndroid
-import cazait.configureKotest
-import cazait.configureKotlinAndroid
+import org.cazait.configureCoroutineAndroid
+import org.cazait.configureHiltAndroid
+import org.cazait.configureKotest
+import org.cazait.configureKotlinAndroid
 
 plugins {
     id("com.android.library")
diff --git a/build-logic/src/main/kotlin/cazait/ComposeAndroid.kt b/build-logic/src/main/kotlin/org/cazait/ComposeAndroid.kt
similarity index 98%
rename from build-logic/src/main/kotlin/cazait/ComposeAndroid.kt
rename to build-logic/src/main/kotlin/org/cazait/ComposeAndroid.kt
index 910a371..d6ec7ed 100644
--- a/build-logic/src/main/kotlin/cazait/ComposeAndroid.kt
+++ b/build-logic/src/main/kotlin/org/cazait/ComposeAndroid.kt
@@ -1,4 +1,4 @@
-package cazait
+package org.cazait
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
diff --git a/build-logic/src/main/kotlin/cazait/CoroutineAndroid.kt b/build-logic/src/main/kotlin/org/cazait/CoroutineAndroid.kt
similarity index 96%
rename from build-logic/src/main/kotlin/cazait/CoroutineAndroid.kt
rename to build-logic/src/main/kotlin/org/cazait/CoroutineAndroid.kt
index f1b7355..f3e6464 100644
--- a/build-logic/src/main/kotlin/cazait/CoroutineAndroid.kt
+++ b/build-logic/src/main/kotlin/org/cazait/CoroutineAndroid.kt
@@ -1,4 +1,4 @@
-package cazait
+package org.cazait
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
diff --git a/build-logic/src/main/kotlin/cazait/Extension.kt b/build-logic/src/main/kotlin/org/cazait/Extension.kt
similarity index 98%
rename from build-logic/src/main/kotlin/cazait/Extension.kt
rename to build-logic/src/main/kotlin/org/cazait/Extension.kt
index 9532982..79c9ebb 100644
--- a/build-logic/src/main/kotlin/cazait/Extension.kt
+++ b/build-logic/src/main/kotlin/org/cazait/Extension.kt
@@ -1,4 +1,4 @@
-package cazait
+package org.cazait
 
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.CommonExtension
diff --git a/build-logic/src/main/kotlin/cazait/HiltAndroid.kt b/build-logic/src/main/kotlin/org/cazait/HiltAndroid.kt
similarity index 97%
rename from build-logic/src/main/kotlin/cazait/HiltAndroid.kt
rename to build-logic/src/main/kotlin/org/cazait/HiltAndroid.kt
index f5f5fe6..796fe6c 100644
--- a/build-logic/src/main/kotlin/cazait/HiltAndroid.kt
+++ b/build-logic/src/main/kotlin/org/cazait/HiltAndroid.kt
@@ -1,4 +1,4 @@
-package cazait
+package org.cazait
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
diff --git a/build-logic/src/main/kotlin/cazait/HiltKotlin.kt b/build-logic/src/main/kotlin/org/cazait/HiltKotlin.kt
similarity index 96%
rename from build-logic/src/main/kotlin/cazait/HiltKotlin.kt
rename to build-logic/src/main/kotlin/org/cazait/HiltKotlin.kt
index e0761d9..3a7a2ec 100644
--- a/build-logic/src/main/kotlin/cazait/HiltKotlin.kt
+++ b/build-logic/src/main/kotlin/org/cazait/HiltKotlin.kt
@@ -1,4 +1,4 @@
-package cazait
+package org.cazait
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
diff --git a/build-logic/src/main/kotlin/cazait/KotestAndroid.kt b/build-logic/src/main/kotlin/org/cazait/KotestAndroid.kt
similarity index 94%
rename from build-logic/src/main/kotlin/cazait/KotestAndroid.kt
rename to build-logic/src/main/kotlin/org/cazait/KotestAndroid.kt
index 413b00e..66fe595 100644
--- a/build-logic/src/main/kotlin/cazait/KotestAndroid.kt
+++ b/build-logic/src/main/kotlin/org/cazait/KotestAndroid.kt
@@ -1,4 +1,4 @@
-package cazait
+package org.cazait
 
 import org.gradle.api.Project
 
diff --git a/build-logic/src/main/kotlin/cazait/KotestKotlin.kt b/build-logic/src/main/kotlin/org/cazait/KotestKotlin.kt
similarity index 96%
rename from build-logic/src/main/kotlin/cazait/KotestKotlin.kt
rename to build-logic/src/main/kotlin/org/cazait/KotestKotlin.kt
index 0b5bdd3..b52e7d3 100644
--- a/build-logic/src/main/kotlin/cazait/KotestKotlin.kt
+++ b/build-logic/src/main/kotlin/org/cazait/KotestKotlin.kt
@@ -1,4 +1,4 @@
-package cazait
+package org.cazait
 
 import org.gradle.api.Project
 import org.gradle.api.tasks.testing.Test
diff --git a/build-logic/src/main/kotlin/cazait/KotlinAndroid.kt b/build-logic/src/main/kotlin/org/cazait/KotlinAndroid.kt
similarity index 99%
rename from build-logic/src/main/kotlin/cazait/KotlinAndroid.kt
rename to build-logic/src/main/kotlin/org/cazait/KotlinAndroid.kt
index ffc479f..29f0c10 100644
--- a/build-logic/src/main/kotlin/cazait/KotlinAndroid.kt
+++ b/build-logic/src/main/kotlin/org/cazait/KotlinAndroid.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UnstableApiUsage")
 
-package cazait
+package org.cazait
 
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
diff --git a/build-logic/src/main/kotlin/cazait/VerifyDetekt.kt b/build-logic/src/main/kotlin/org/cazait/VerifyDetekt.kt
similarity index 94%
rename from build-logic/src/main/kotlin/cazait/VerifyDetekt.kt
rename to build-logic/src/main/kotlin/org/cazait/VerifyDetekt.kt
index 0fab424..97db2c2 100644
--- a/build-logic/src/main/kotlin/cazait/VerifyDetekt.kt
+++ b/build-logic/src/main/kotlin/org/cazait/VerifyDetekt.kt
@@ -1,4 +1,4 @@
-package cazait
+package org.cazait
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
index 5ca32e4..57bb116 100644
--- a/core/data/build.gradle.kts
+++ b/core/data/build.gradle.kts
@@ -1,10 +1,9 @@
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
-    id("java-library")
-    alias(libs.plugins.kotlin.jvm)
+    id("cazait.android.library")
+    id("cazait.android.hilt")
+    id("kotlinx-serialization")
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
-}
\ No newline at end of file
+android {
+    namespace = "org.cazait.core.data"
+}
diff --git a/core/data/src/main/java/org/cazait/core/data/MyClass.kt b/core/data/src/main/kotlin/org/cazait/core/data/MyClass.kt
similarity index 100%
rename from core/data/src/main/java/org/cazait/core/data/MyClass.kt
rename to core/data/src/main/kotlin/org/cazait/core/data/MyClass.kt
diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts
index 5ca32e4..8265e05 100644
--- a/core/domain/build.gradle.kts
+++ b/core/domain/build.gradle.kts
@@ -1,10 +1,9 @@
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
-    id("java-library")
-    alias(libs.plugins.kotlin.jvm)
+    id("cazait.android.library")
+    id("cazait.android.hilt")
+    id("kotlinx-serialization")
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
-}
\ No newline at end of file
+android {
+    namespace = "org.cazait.core.domain"
+}
diff --git a/core/domain/src/main/java/org/cazait/domain/MyClass.kt b/core/domain/src/main/kotlin/org/cazait/domain/MyClass.kt
similarity index 100%
rename from core/domain/src/main/java/org/cazait/domain/MyClass.kt
rename to core/domain/src/main/kotlin/org/cazait/domain/MyClass.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 894f991..263d558 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -112,6 +112,8 @@ play-services-location = { module = "com.google.android.gms:play-services-locati
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofitVersion" }
 
 # Hilt (DI)
+hilt-core = { group = "com.google.dagger", name = "hilt-core", version.ref = "hilt" }
+hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" }
 hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
 hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" }
 hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }
@@ -123,6 +125,7 @@ hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-com
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-play-services = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "kotlinxCoroutines" }
+kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
 
 # Testing
 junit = { group = "junit", name = "junit", version.ref = "junit" }