diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 6ef06e25a3..3fa0ef5697 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -12,6 +12,7 @@
       </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
           <package name="" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="javax" withSubpackages="true" static="false" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6aec2d1bca..19acfb759e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -72,12 +72,14 @@ android {
 dependencies {
     implementation(projects.feature.interests)
     implementation(projects.feature.foryou)
-    implementation(projects.feature.bookmarks)
+    implementation(projects.feature.bookmarks.api)
+    implementation(projects.feature.bookmarks.impl)
     implementation(projects.feature.topic)
     implementation(projects.feature.search)
     implementation(projects.feature.settings)
 
     implementation(projects.core.common)
+    implementation(projects.core.navigation)
     implementation(projects.core.ui)
     implementation(projects.core.designsystem)
     implementation(projects.core.data)
diff --git a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
index 54053a1bbf..be8976f90a 100644
--- a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
+++ b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
@@ -47,7 +47,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import javax.inject.Inject
-import com.google.samples.apps.nowinandroid.feature.bookmarks.R as BookmarksR
+import com.google.samples.apps.nowinandroid.feature.bookmarks.impl.R as BookmarksR
 import com.google.samples.apps.nowinandroid.feature.foryou.R as FeatureForyouR
 import com.google.samples.apps.nowinandroid.feature.search.R as FeatureSearchR
 import com.google.samples.apps.nowinandroid.feature.settings.R as SettingsR
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
index e079c98f45..3c4c9eb992 100644
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
@@ -19,12 +19,20 @@ package com.google.samples.apps.nowinandroid.navigation
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.NavHost
-import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.bookmarksScreen
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.navigation
+import androidx.navigation3.runtime.NavEntry
+import androidx.navigation3.runtime.entryProvider
+import androidx.navigation3.ui.NavDisplay
+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksRoute
+import com.google.samples.apps.nowinandroid.feature.bookmarks.impl.navigation.bookmarksScreen
 import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouBaseRoute
+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouRoute
 import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouSection
-import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterests
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute
+import com.google.samples.apps.nowinandroid.feature.search.navigation.SearchRoute
 import com.google.samples.apps.nowinandroid.feature.search.navigation.searchScreen
-import com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopic
+import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicRoute
 import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.INTERESTS
 import com.google.samples.apps.nowinandroid.ui.NiaAppState
@@ -44,29 +52,57 @@ fun NiaNavHost(
     modifier: Modifier = Modifier,
 ) {
     val navController = appState.navController
-    NavHost(
-        navController = navController,
-        startDestination = ForYouBaseRoute,
-        modifier = modifier,
-    ) {
-        forYouSection(
-            onTopicClick = navController::navigateToTopic,
+    val nav3Navigator = appState.nav3Navigator
+    NavDisplay(
+        backStack = nav3Navigator.backStack,
+        onBack = { nav3Navigator.goBack() },
+        entryProvider = entryProvider(
+            fallback = { key ->
+                println("$key not found, using fallback entry")
+                NavEntry(key = key) {
+                    NavHost(
+                        navController = navController,
+                        startDestination = ForYouBaseRoute,
+                        modifier = modifier,
+                    ) {
+                        navigation<ForYouBaseRoute>(startDestination = ForYouRoute) {
+                            composable<ForYouRoute> {}
+                            composable<TopicRoute> {}
+                        }
+                        composable<ForYouRoute> {}
+                        composable<BookmarksRoute> {}
+                        composable<SearchRoute> {}
+                        composable<InterestsRoute>{}
+                    }
+                }
+            },
         ) {
+            forYouSection(
+                onTopicClick = {
+                    nav3Navigator.goTo(route = TopicRoute(it))
+                },
+            )
+            bookmarksScreen(
+                onTopicClick = { it: String ->
+                    nav3Navigator.goTo(route = InterestsRoute(it))
+                },
+                onShowSnackbar = onShowSnackbar
+            )
             topicScreen(
                 showBackButton = true,
+                onBackClick = { nav3Navigator.goBack() },
+                onTopicClick = {
+                    nav3Navigator.goTo(route = TopicRoute(it))
+                },
+            )
+            searchScreen(
                 onBackClick = navController::popBackStack,
-                onTopicClick = navController::navigateToTopic,
+                onInterestsClick = { appState.navigateToTopLevelDestination(INTERESTS) },
+                onTopicClick = {
+                    nav3Navigator.goTo(route = InterestsRoute(it))
+                },
             )
-        }
-        bookmarksScreen(
-            onTopicClick = navController::navigateToInterests,
-            onShowSnackbar = onShowSnackbar,
-        )
-        searchScreen(
-            onBackClick = navController::popBackStack,
-            onInterestsClick = { appState.navigateToTopLevelDestination(INTERESTS) },
-            onTopicClick = navController::navigateToInterests,
-        )
-        interestsListDetailScreen()
-    }
+            interestsListDetailScreen()
+        },
+    )
 }
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt
index 429e626ffb..7404a8976e 100644
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt
@@ -20,12 +20,12 @@ import androidx.annotation.StringRes
 import androidx.compose.ui.graphics.vector.ImageVector
 import com.google.samples.apps.nowinandroid.R
 import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
-import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BookmarksRoute
+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksRoute
 import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouBaseRoute
 import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouRoute
 import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute
 import kotlin.reflect.KClass
-import com.google.samples.apps.nowinandroid.feature.bookmarks.R as bookmarksR
+import com.google.samples.apps.nowinandroid.feature.bookmarks.impl.R as bookmarksR
 import com.google.samples.apps.nowinandroid.feature.foryou.R as forYouR
 import com.google.samples.apps.nowinandroid.feature.search.R as searchR
 
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
index 5a32d45858..06d52fefae 100644
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
@@ -136,6 +136,9 @@ internal fun NiaApp(
 ) {
     val unreadDestinations by appState.topLevelDestinationsWithUnreadResources
         .collectAsStateWithLifecycle()
+
+    // TODO: This is only used to determine whether the bottom nav item is selected
+    // this can be improved by just getting
     val currentDestination = appState.currentDestination
 
     if (showSettingsDialog) {
@@ -144,6 +147,10 @@ internal fun NiaApp(
         )
     }
 
+    // TODO: figure out how have the existing navigation bar support both old and new routes
+    //  essentially we need a migration path from what's below to the common UI recipe
+    //  this probably comes down to how the back stack is modelled.
+
     NiaNavigationSuiteScaffold(
         navigationSuiteItems = {
             appState.topLevelDestinations.forEach { destination ->
@@ -167,9 +174,9 @@ internal fun NiaApp(
                     },
                     label = { Text(stringResource(destination.iconTextId)) },
                     modifier =
-                    Modifier
-                        .testTag("NiaNavItem")
-                        .then(if (hasUnread) Modifier.notificationDot() else Modifier),
+                        Modifier
+                            .testTag("NiaNavItem")
+                            .then(if (hasUnread) Modifier.notificationDot() else Modifier),
                 )
             }
         },
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
index 7c892c854e..1fab761e8e 100644
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
@@ -19,35 +19,44 @@ package com.google.samples.apps.nowinandroid.ui
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hasRoute
+import androidx.navigation.NavGraph
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
+import androidx.navigation.NavOptions
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navOptions
+import androidx.navigation.toRoute
 import androidx.tracing.trace
 import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
 import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
 import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
 import com.google.samples.apps.nowinandroid.core.ui.TrackDisposableJank
-import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.navigateToBookmarks
-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.navigateToForYou
-import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterests
+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksRoute
+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouRoute
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute
+import com.google.samples.apps.nowinandroid.feature.search.navigation.SearchRoute
 import com.google.samples.apps.nowinandroid.feature.search.navigation.navigateToSearch
+import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicRoute
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.BOOKMARKS
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.FOR_YOU
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.INTERESTS
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
 import kotlinx.datetime.TimeZone
 
 @Composable
@@ -59,6 +68,11 @@ fun rememberNiaAppState(
     navController: NavHostController = rememberNavController(),
 ): NiaAppState {
     NavigationTrackingSideEffect(navController)
+
+    val nav3Navigator = remember(navController) {
+        Nav3NavigatorSimple(navController)
+    }
+
     return remember(
         navController,
         coroutineScope,
@@ -68,6 +82,7 @@ fun rememberNiaAppState(
     ) {
         NiaAppState(
             navController = navController,
+            nav3Navigator = nav3Navigator,
             coroutineScope = coroutineScope,
             networkMonitor = networkMonitor,
             userNewsResourceRepository = userNewsResourceRepository,
@@ -79,6 +94,7 @@ fun rememberNiaAppState(
 @Stable
 class NiaAppState(
     val navController: NavHostController,
+    val nav3Navigator: Nav3NavigatorSimple,
     coroutineScope: CoroutineScope,
     networkMonitor: NetworkMonitor,
     userNewsResourceRepository: UserNewsResourceRepository,
@@ -169,9 +185,11 @@ class NiaAppState(
             }
 
             when (topLevelDestination) {
-                FOR_YOU -> navController.navigateToForYou(topLevelNavOptions)
-                BOOKMARKS -> navController.navigateToBookmarks(topLevelNavOptions)
-                INTERESTS -> navController.navigateToInterests(null, topLevelNavOptions)
+                FOR_YOU -> nav3Navigator.goTo(route = ForYouRoute, topLevelNavOptions)
+                BOOKMARKS -> nav3Navigator.goTo(route = BookmarksRoute, topLevelNavOptions)
+                INTERESTS -> {
+                    nav3Navigator.goTo(route = InterestsRoute(null), topLevelNavOptions)
+                }
             }
         }
     }
@@ -196,3 +214,107 @@ private fun NavigationTrackingSideEffect(navController: NavHostController) {
         }
     }
 }
+
+class Nav3NavigatorSimple(val navController: NavHostController){
+
+    val coroutineScope = CoroutineScope(Job() + Dispatchers.Main)
+
+    // We need a single element to avoid "backStack cannot be empty" error b/430023647
+    val backStack = mutableStateListOf<Any>(Unit)
+
+    // Expose the current top level route for consumers
+    lateinit var topLevelKey : String
+
+    // key = top level route string, value = route instance
+    private var topLevelStacks : LinkedHashMap<String, MutableList<Any>> = linkedMapOf()
+
+    init {
+        coroutineScope.launch {
+            navController.currentBackStack.collect { nav2BackStack ->
+
+                topLevelStacks.clear()
+
+                val rootNode : NavGraph = navController.graph
+                println("Root node start destination: ${rootNode.startDestinationRoute}")
+
+                nav2BackStack.forEach { entry ->
+
+                    println("\n==ENTRY==")
+                    println("Entry: $entry")
+                    println("Destination: ${entry.destination}")
+                    println("Destination navigatorName: ${entry.destination.navigatorName}")
+                    println("Route: ${entry.destination.route}")
+                    println("Parent destination: ${entry.destination.parent}")
+
+                    val destination = entry.destination
+
+                    // We only care about navigable destinations
+                    if (destination.navigatorName == "composable"){
+
+                        val parentDestination = destination.parent
+                        var stackName = destination.route!!
+
+                        // Convert the entry into a route instance
+                        val routeInstance =
+                            if (destination.hasRoute<BookmarksRoute>()) {
+                                entry.toRoute<BookmarksRoute>()
+                            } else if (destination.hasRoute<TopicRoute>()) {
+                                entry.toRoute<TopicRoute>()
+                            } else if (destination.hasRoute<SearchRoute>()) {
+                                entry.toRoute<SearchRoute>()
+                            } else if (destination.hasRoute<InterestsRoute>()) {
+                                entry.toRoute<InterestsRoute>()
+                            } else if (destination.hasRoute<ForYouRoute>()) {
+                                entry.toRoute<ForYouRoute>()
+                            } else {
+                                // Non migrated top level route
+                                println("Non migrated destination: $destination")
+                                entry
+                            }
+
+                        // For nested stacks, use the parent destination's start destination route
+                        // as the stack name.
+                        if (parentDestination != rootNode){
+                            stackName = parentDestination?.startDestinationRoute!!
+                        }
+                        add(stackName, routeInstance)
+                    }
+                }
+                updateBackStack()
+            }
+        }
+    }
+
+    private fun add(stackName: String, route: Any){
+        if (topLevelStacks[stackName] == null){
+            topLevelStacks.put(stackName, mutableListOf(route))
+        } else {
+            topLevelStacks[stackName]?.add(route)
+        }
+        topLevelKey = stackName
+        updateBackStack()
+    }
+
+    private fun updateBackStack() {
+        backStack.apply {
+            clear()
+            addAll(topLevelStacks.flatMap { it.value })
+        }
+        println("Back stack: $backStack")
+    }
+
+    fun goBack(){
+        val removedKey = topLevelStacks[topLevelKey]?.removeLastOrNull()
+        // If the removed key was a top level key, remove the associated top level stack
+        topLevelStacks.remove(removedKey)
+        topLevelKey = topLevelStacks.keys.last()
+        updateBackStack()
+        navController.popBackStack()
+    }
+
+    fun goTo(route: Any, navOptions: NavOptions? = null){
+        add(topLevelKey, route)
+        navController.navigate(route = route, navOptions = navOptions)
+    }
+}
+
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt
index c0f425c65a..a95e4b4f8a 100644
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt
@@ -50,8 +50,8 @@ import androidx.compose.ui.layout.layout
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
+import androidx.navigation3.runtime.EntryProviderBuilder
+import androidx.navigation3.runtime.entry
 import com.google.samples.apps.nowinandroid.feature.interests.InterestsRoute
 import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute
 import com.google.samples.apps.nowinandroid.feature.topic.TopicDetailPlaceholder
@@ -64,8 +64,8 @@ import kotlin.math.max
 
 @Serializable internal object TopicPlaceholderRoute
 
-fun NavGraphBuilder.interestsListDetailScreen() {
-    composable<InterestsRoute> {
+fun EntryProviderBuilder<Any>.interestsListDetailScreen() {
+    entry<InterestsRoute> {
         InterestsListDetailScreen()
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
index 5d396d2a49..79be8122fe 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
@@ -35,7 +35,7 @@ internal fun Project.configureKotlinAndroid(
     commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
-        compileSdk = 35
+        compileSdk = 36
 
         defaultConfig {
             minSdk = 21
diff --git a/feature/bookmarks/.gitignore b/core/navigation/.gitignore
similarity index 100%
rename from feature/bookmarks/.gitignore
rename to core/navigation/.gitignore
diff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.kts
new file mode 100644
index 0000000000..83cac9f46b
--- /dev/null
+++ b/core/navigation/build.gradle.kts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2025 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.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+plugins {
+    alias(libs.plugins.nowinandroid.android.library)
+}
+
+android {
+    namespace = "com.google.samples.apps.nowinandroid.core.navigation"
+}
+
+dependencies {
+    api(libs.androidx.navigation3.ui)
+    api(libs.androidx.navigation3.runtime)
+}
\ No newline at end of file
diff --git a/core/navigation/src/main/kotlin/NavigationModule.kt b/core/navigation/src/main/kotlin/NavigationModule.kt
new file mode 100644
index 0000000000..1086ac807b
--- /dev/null
+++ b/core/navigation/src/main/kotlin/NavigationModule.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2025 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.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.core.navigation
+
+// Marker interface for top level routes
+// interface TopLevelRoute
\ No newline at end of file
diff --git a/feature/bookmarks/api/.gitignore b/feature/bookmarks/api/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/feature/bookmarks/api/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/feature/bookmarks/api/build.gradle.kts b/feature/bookmarks/api/build.gradle.kts
new file mode 100644
index 0000000000..6f7626dc71
--- /dev/null
+++ b/feature/bookmarks/api/build.gradle.kts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 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.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    alias(libs.plugins.nowinandroid.android.library)
+    alias(libs.plugins.kotlin.serialization)
+}
+
+android {
+    namespace = "com.google.samples.apps.nowinandroid.feature.bookmarks.api"
+}
+
+dependencies {
+    implementation(projects.core.navigation)
+    implementation(libs.kotlinx.serialization.json)
+}
diff --git a/feature/bookmarks/api/src/main/AndroidManifest.xml b/feature/bookmarks/api/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..90b5d04981
--- /dev/null
+++ b/feature/bookmarks/api/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2025 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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest />
\ No newline at end of file
diff --git a/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/navigation/BookmarksRoutes.kt b/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/navigation/BookmarksRoutes.kt
new file mode 100644
index 0000000000..7196c8d292
--- /dev/null
+++ b/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/navigation/BookmarksRoutes.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2025 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.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation
+
+import kotlinx.serialization.Serializable
+
+@Serializable object BookmarksRoute
\ No newline at end of file
diff --git a/feature/bookmarks/impl/.gitignore b/feature/bookmarks/impl/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/feature/bookmarks/impl/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/feature/bookmarks/README.md b/feature/bookmarks/impl/README.md
similarity index 100%
rename from feature/bookmarks/README.md
rename to feature/bookmarks/impl/README.md
diff --git a/feature/bookmarks/build.gradle.kts b/feature/bookmarks/impl/build.gradle.kts
similarity index 90%
rename from feature/bookmarks/build.gradle.kts
rename to feature/bookmarks/impl/build.gradle.kts
index 51a15ce7a0..95b81c3be4 100644
--- a/feature/bookmarks/build.gradle.kts
+++ b/feature/bookmarks/impl/build.gradle.kts
@@ -21,12 +21,13 @@ plugins {
 }
 
 android {
-    namespace = "com.google.samples.apps.nowinandroid.feature.bookmarks"
+    namespace = "com.google.samples.apps.nowinandroid.feature.bookmarks.impl"
 }
 
 dependencies {
+    implementation(projects.feature.bookmarks.api)
     implementation(projects.core.data)
-
+    implementation(projects.core.navigation)
     testImplementation(projects.core.testing)
 
     androidTestImplementation(libs.bundles.androidx.compose.ui.test)
diff --git a/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt b/feature/bookmarks/impl/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
similarity index 97%
rename from feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
rename to feature/bookmarks/impl/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
index dd01b84c99..8a4b6ac89f 100644
--- a/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
+++ b/feature/bookmarks/impl/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
@@ -36,6 +36,7 @@ import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.testing.TestLifecycleOwner
 import com.google.samples.apps.nowinandroid.core.testing.data.userNewsResourcesTestData
 import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState
+import com.google.samples.apps.nowinandroid.feature.bookmarks.impl.BookmarksScreen
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -43,7 +44,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 /**
- * UI tests for [BookmarksScreen] composable.
+ * UI tests for [com.google.samples.apps.nowinandroid.feature.bookmarks.impl.BookmarksScreen] composable.
  */
 class BookmarksScreenTest {
 
diff --git a/feature/bookmarks/src/main/AndroidManifest.xml b/feature/bookmarks/impl/src/main/AndroidManifest.xml
similarity index 100%
rename from feature/bookmarks/src/main/AndroidManifest.xml
rename to feature/bookmarks/impl/src/main/AndroidManifest.xml
diff --git a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt b/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/BookmarksScreen.kt
similarity index 98%
rename from feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
rename to feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/BookmarksScreen.kt
index 7c229c5ea5..db98ba94d8 100644
--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
+++ b/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/BookmarksScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2025 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.feature.bookmarks
+package com.google.samples.apps.nowinandroid.feature.bookmarks.impl
 
 import androidx.annotation.VisibleForTesting
 import androidx.compose.foundation.Image
@@ -76,7 +76,7 @@ import com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParam
 import com.google.samples.apps.nowinandroid.core.ui.newsFeed
 
 @Composable
-internal fun BookmarksRoute(
+fun BookmarksScreenStateful(
     onTopicClick: (String) -> Unit,
     onShowSnackbar: suspend (String, String?) -> Boolean,
     modifier: Modifier = Modifier,
@@ -101,7 +101,7 @@ internal fun BookmarksRoute(
  */
 @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
 @Composable
-internal fun BookmarksScreen(
+fun BookmarksScreen(
     feedState: NewsFeedUiState,
     onShowSnackbar: suspend (String, String?) -> Boolean,
     removeFromBookmarks: (String) -> Unit,
diff --git a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt b/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/BookmarksViewModel.kt
similarity index 96%
rename from feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt
rename to feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/BookmarksViewModel.kt
index f936024855..3f715564ac 100644
--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt
+++ b/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/BookmarksViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2025 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.feature.bookmarks
+package com.google.samples.apps.nowinandroid.feature.bookmarks.impl
 
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
diff --git a/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/navigation/BookmarksNavigation.kt b/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/navigation/BookmarksNavigation.kt
new file mode 100644
index 0000000000..49fd66a873
--- /dev/null
+++ b/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/navigation/BookmarksNavigation.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2025 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.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.feature.bookmarks.impl.navigation
+
+import androidx.navigation3.runtime.EntryProviderBuilder
+import androidx.navigation3.runtime.entry
+import com.google.samples.apps.nowinandroid.feature.bookmarks.impl.BookmarksScreenStateful
+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksRoute
+
+fun EntryProviderBuilder<Any>.bookmarksScreen(
+    onTopicClick: (String) -> Unit,
+    onShowSnackbar: suspend (String, String?) -> Boolean,
+) {
+    entry<BookmarksRoute> {
+        BookmarksScreenStateful(onTopicClick, onShowSnackbar)
+    }
+}
diff --git a/feature/bookmarks/src/main/res/drawable/feature_bookmarks_img_empty_bookmarks.xml b/feature/bookmarks/impl/src/main/res/drawable/feature_bookmarks_img_empty_bookmarks.xml
similarity index 100%
rename from feature/bookmarks/src/main/res/drawable/feature_bookmarks_img_empty_bookmarks.xml
rename to feature/bookmarks/impl/src/main/res/drawable/feature_bookmarks_img_empty_bookmarks.xml
diff --git a/feature/bookmarks/src/main/res/values/strings.xml b/feature/bookmarks/impl/src/main/res/values/strings.xml
similarity index 100%
rename from feature/bookmarks/src/main/res/values/strings.xml
rename to feature/bookmarks/impl/src/main/res/values/strings.xml
diff --git a/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt b/feature/bookmarks/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
similarity index 98%
rename from feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
rename to feature/bookmarks/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
index aa42adae21..8885824cfd 100644
--- a/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
+++ b/feature/bookmarks/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
@@ -23,6 +23,7 @@ import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserData
 import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule
 import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState.Loading
 import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState.Success
+import com.google.samples.apps.nowinandroid.feature.bookmarks.impl.BookmarksViewModel
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
diff --git a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt
deleted file mode 100644
index ea8d525ab0..0000000000
--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 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.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.samples.apps.nowinandroid.feature.bookmarks.navigation
-
-import androidx.navigation.NavController
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.NavOptions
-import androidx.navigation.compose.composable
-import com.google.samples.apps.nowinandroid.feature.bookmarks.BookmarksRoute
-import kotlinx.serialization.Serializable
-
-@Serializable object BookmarksRoute
-
-fun NavController.navigateToBookmarks(navOptions: NavOptions) =
-    navigate(route = BookmarksRoute, navOptions)
-
-fun NavGraphBuilder.bookmarksScreen(
-    onTopicClick: (String) -> Unit,
-    onShowSnackbar: suspend (String, String?) -> Boolean,
-) {
-    composable<BookmarksRoute> {
-        BookmarksRoute(onTopicClick, onShowSnackbar)
-    }
-}
diff --git a/feature/foryou/build.gradle.kts b/feature/foryou/build.gradle.kts
index 59f6844cf2..9fe132cfe4 100644
--- a/feature/foryou/build.gradle.kts
+++ b/feature/foryou/build.gradle.kts
@@ -29,6 +29,7 @@ dependencies {
     implementation(libs.accompanist.permissions)
     implementation(projects.core.data)
     implementation(projects.core.domain)
+    implementation(projects.core.navigation)
     implementation(projects.core.notifications)
 
     testImplementation(libs.hilt.android.testing)
diff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt
index b77ce72a01..60d662791d 100644
--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt
+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt
@@ -16,12 +16,8 @@
 
 package com.google.samples.apps.nowinandroid.feature.foryou.navigation
 
-import androidx.navigation.NavController
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.NavOptions
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.navigation
-import androidx.navigation.navDeepLink
+import androidx.navigation3.runtime.EntryProviderBuilder
+import androidx.navigation3.runtime.entry
 import com.google.samples.apps.nowinandroid.core.notifications.DEEP_LINK_URI_PATTERN
 import com.google.samples.apps.nowinandroid.feature.foryou.ForYouScreen
 import kotlinx.serialization.Serializable
@@ -30,36 +26,30 @@ import kotlinx.serialization.Serializable
 
 @Serializable data object ForYouBaseRoute // route to base navigation graph
 
-fun NavController.navigateToForYou(navOptions: NavOptions) = navigate(route = ForYouRoute, navOptions)
 
 /**
  *  The ForYou section of the app. It can also display information about topics.
  *  This should be supplied from a separate module.
  *
  *  @param onTopicClick - Called when a topic is clicked, contains the ID of the topic
- *  @param topicDestination - Destination for topic content
  */
-fun NavGraphBuilder.forYouSection(
-    onTopicClick: (String) -> Unit,
-    topicDestination: NavGraphBuilder.() -> Unit,
+fun EntryProviderBuilder<Any>.forYouSection(
+    onTopicClick: (String) -> Unit
 ) {
-    navigation<ForYouBaseRoute>(startDestination = ForYouRoute) {
-        composable<ForYouRoute>(
-            deepLinks = listOf(
-                navDeepLink {
-                    /**
-                     * This destination has a deep link that enables a specific news resource to be
-                     * opened from a notification (@see SystemTrayNotifier for more). The news resource
-                     * ID is sent in the URI rather than being modelled in the route type because it's
-                     * transient data (stored in SavedStateHandle) that is cleared after the user has
-                     * opened the news resource.
-                     */
-                    uriPattern = DEEP_LINK_URI_PATTERN
-                },
-            ),
-        ) {
-            ForYouScreen(onTopicClick)
-        }
-        topicDestination()
+    entry<ForYouRoute>(
+        /*deepLinks = listOf(
+            navDeepLink {
+                *//**
+                 * This destination has a deep link that enables a specific news resource to be
+                 * opened from a notification (@see SystemTrayNotifier for more). The news resource
+                 * ID is sent in the URI rather than being modelled in the route type because it's
+                 * transient data (stored in SavedStateHandle) that is cleared after the user has
+                 * opened the news resource.
+                 *//*
+                uriPattern = DEEP_LINK_URI_PATTERN
+            },
+        ),*/
+    ) {
+        ForYouScreen(onTopicClick)
     }
 }
diff --git a/feature/interests/build.gradle.kts b/feature/interests/build.gradle.kts
index 2b84b135f7..55f4290d17 100644
--- a/feature/interests/build.gradle.kts
+++ b/feature/interests/build.gradle.kts
@@ -26,6 +26,7 @@ android {
 dependencies {
     implementation(projects.core.data)
     implementation(projects.core.domain)
+    implementation(projects.core.navigation)
 
     testImplementation(projects.core.testing)
     testImplementation(libs.robolectric)
diff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt
index d83e4a9b2c..4d1296281c 100644
--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt
+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt
@@ -16,18 +16,9 @@
 
 package com.google.samples.apps.nowinandroid.feature.interests.navigation
 
-import androidx.navigation.NavController
-import androidx.navigation.NavOptions
 import kotlinx.serialization.Serializable
 
 @Serializable data class InterestsRoute(
     // The ID of the topic which will be initially selected at this destination
     val initialTopicId: String? = null,
 )
-
-fun NavController.navigateToInterests(
-    initialTopicId: String? = null,
-    navOptions: NavOptions? = null,
-) {
-    navigate(route = InterestsRoute(initialTopicId), navOptions)
-}
diff --git a/feature/search/build.gradle.kts b/feature/search/build.gradle.kts
index 5bb659c35e..13e8cd7a88 100644
--- a/feature/search/build.gradle.kts
+++ b/feature/search/build.gradle.kts
@@ -27,6 +27,7 @@ android {
 dependencies {
     implementation(projects.core.data)
     implementation(projects.core.domain)
+    implementation(projects.core.navigation)
 
     testImplementation(projects.core.testing)
 
diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt
index 3b16e5f717..0cdd6b01c5 100644
--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt
+++ b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt
@@ -20,6 +20,8 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
+import androidx.navigation3.runtime.EntryProviderBuilder
+import androidx.navigation3.runtime.entry
 import com.google.samples.apps.nowinandroid.feature.search.SearchRoute
 import kotlinx.serialization.Serializable
 
@@ -28,14 +30,14 @@ import kotlinx.serialization.Serializable
 fun NavController.navigateToSearch(navOptions: NavOptions? = null) =
     navigate(SearchRoute, navOptions)
 
-fun NavGraphBuilder.searchScreen(
+fun EntryProviderBuilder<Any>.searchScreen(
     onBackClick: () -> Unit,
     onInterestsClick: () -> Unit,
     onTopicClick: (String) -> Unit,
 ) {
     // TODO: Handle back stack for each top-level destination. At the moment each top-level
     // destination may have own search screen's back stack.
-    composable<SearchRoute> {
+    entry<SearchRoute> {
         SearchRoute(
             onBackClick = onBackClick,
             onInterestsClick = onInterestsClick,
diff --git a/feature/topic/build.gradle.kts b/feature/topic/build.gradle.kts
index bd8b59ec84..00c01cbf76 100644
--- a/feature/topic/build.gradle.kts
+++ b/feature/topic/build.gradle.kts
@@ -26,6 +26,7 @@ android {
 
 dependencies {
     implementation(projects.core.data)
+    implementation(projects.core.navigation)
 
     testImplementation(projects.core.testing)
     testImplementation(libs.robolectric)
diff --git a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt
index 69059c81d9..c32d41b339 100644
--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt
+++ b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt
@@ -14,33 +14,28 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalUuidApi::class)
+
 package com.google.samples.apps.nowinandroid.feature.topic.navigation
 
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.navigation.NavController
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.NavOptionsBuilder
-import androidx.navigation.compose.composable
-import androidx.navigation.toRoute
+import androidx.navigation3.runtime.EntryProviderBuilder
+import androidx.navigation3.runtime.entry
 import com.google.samples.apps.nowinandroid.feature.topic.TopicScreen
 import com.google.samples.apps.nowinandroid.feature.topic.TopicViewModel
 import kotlinx.serialization.Serializable
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
-@Serializable data class TopicRoute(val id: String)
-
-fun NavController.navigateToTopic(topicId: String, navOptions: NavOptionsBuilder.() -> Unit = {}) {
-    navigate(route = TopicRoute(topicId)) {
-        navOptions()
-    }
-}
+@Serializable data class TopicRoute(val id: String, val uuid: String = Uuid.random().toString())
 
-fun NavGraphBuilder.topicScreen(
+fun EntryProviderBuilder<Any>.topicScreen(
     showBackButton: Boolean,
     onBackClick: () -> Unit,
     onTopicClick: (String) -> Unit,
 ) {
-    composable<TopicRoute> { entry ->
-        val id = entry.toRoute<TopicRoute>().id
+    entry<TopicRoute> { entry ->
+        val id = entry.id
         TopicScreen(
             showBackButton = showBackButton,
             onBackClick = onBackClick,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 477dde9165..9f96aaa305 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 accompanist = "0.37.0"
 androidDesugarJdkLibs = "2.1.4"
 # AGP and tools should be updated together
-androidGradlePlugin = "8.9.0"
+androidGradlePlugin = "8.9.3"
 androidTools = "31.9.0"
 androidxActivity = "1.9.3"
 androidxAppCompat = "1.7.0"
@@ -21,6 +21,7 @@ androidxLintGradle = "1.0.0-alpha03"
 androidxMacroBenchmark = "1.3.4"
 androidxMetrics = "1.0.0-beta01"
 androidxNavigation = "2.8.5"
+androidxNavigation3 = "1.0.0-alpha04"
 androidxProfileinstaller = "1.4.1"
 androidxTestCore = "1.6.1"
 androidxTestExt = "1.2.1"
@@ -59,6 +60,9 @@ room = "2.6.1"
 secrets = "2.0.1"
 truth = "1.4.4"
 turbine = "1.2.0"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+material = "1.12.0"
 
 [bundles]
 androidx-compose-ui-test = ["androidx-compose-ui-test", "androidx-compose-ui-testManifest"]
@@ -99,6 +103,8 @@ androidx-lint-gradle = { group = "androidx.lint", name = "lint-gradle", version.
 androidx-metrics = { group = "androidx.metrics", name = "metrics-performance", version.ref = "androidxMetrics" }
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" }
 androidx-navigation-testing = { group = "androidx.navigation", name = "navigation-testing", version.ref = "androidxNavigation" }
+androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "androidxNavigation3" }
+androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "androidxNavigation3" }
 androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "androidxProfileinstaller" }
 androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTestCore" }
 androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidxEspresso" }
@@ -161,6 +167,9 @@ firebase-performance-gradlePlugin = { group = "com.google.firebase", name = "per
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
 room-gradlePlugin = { group = "androidx.room", name = "room-gradle-plugin", version.ref = "room" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
@@ -198,3 +207,4 @@ nowinandroid-android-room = { id = "nowinandroid.android.room" }
 nowinandroid-android-test = { id = "nowinandroid.android.test" }
 nowinandroid-hilt = { id = "nowinandroid.hilt" }
 nowinandroid-jvm-library = { id = "nowinandroid.jvm.library" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2b8c6e45c6..3a83fdd84a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -67,7 +67,8 @@ include(":core:ui")
 
 include(":feature:foryou")
 include(":feature:interests")
-include(":feature:bookmarks")
+include(":feature:bookmarks:api")
+include(":feature:bookmarks:impl")
 include(":feature:topic")
 include(":feature:search")
 include(":feature:settings")
@@ -83,3 +84,4 @@ check(JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
     https://developer.android.com/build/jdks#jdk-config-in-studio
     """.trimIndent()
 }
+include(":core:navigation")