diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinMultiplatform.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinMultiplatform.kt
index cd5ca7545..225588b99 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinMultiplatform.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinMultiplatform.kt
@@ -17,12 +17,12 @@
 package com.google.samples.apps.nowinandroid
 
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.konan.target.HostManager
 
 internal fun Project.configureKotlinMultiplatform() {
-    (project.kotlinExtension as KotlinMultiplatformExtension).apply {
+    extensions.configure<KotlinMultiplatformExtension> {
         jvm()
 
         js {
diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
index 5d6cabfdf..d7844ecc1 100644
--- a/core/model/build.gradle.kts
+++ b/core/model/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2024 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,16 @@
  */
 
 plugins {
-    alias(libs.plugins.nowinandroid.jvm.library)
+    alias(libs.plugins.nowinandroid.kmp.library)
 }
 
-dependencies {
-    api(libs.kotlinx.datetime)
+kotlin {
+    sourceSets {
+        commonMain.dependencies {
+            api(libs.kotlinx.datetime)
+        }
+        commonTest.dependencies {
+            implementation(libs.kotlin.test)
+        }
+    }
 }
diff --git a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/DarkThemeConfig.kt b/core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/DarkThemeConfig.kt
similarity index 100%
rename from core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/DarkThemeConfig.kt
rename to core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/DarkThemeConfig.kt
diff --git a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.kt b/core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.kt
similarity index 100%
rename from core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.kt
rename to core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.kt
diff --git a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.kt b/core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.kt
similarity index 100%
rename from core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.kt
rename to core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.kt
diff --git a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/SearchResult.kt b/core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/SearchResult.kt
similarity index 100%
rename from core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/SearchResult.kt
rename to core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/SearchResult.kt
diff --git a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/ThemeBrand.kt b/core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/ThemeBrand.kt
similarity index 100%
rename from core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/ThemeBrand.kt
rename to core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/ThemeBrand.kt
diff --git a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/Topic.kt b/core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/Topic.kt
similarity index 100%
rename from core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/Topic.kt
rename to core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/Topic.kt
diff --git a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserData.kt b/core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserData.kt
similarity index 100%
rename from core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserData.kt
rename to core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserData.kt
diff --git a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserNewsResource.kt b/core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserNewsResource.kt
similarity index 100%
rename from core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserNewsResource.kt
rename to core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserNewsResource.kt
diff --git a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserSearchResult.kt b/core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserSearchResult.kt
similarity index 100%
rename from core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserSearchResult.kt
rename to core/model/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserSearchResult.kt