diff --git a/app/src/main/java/com/edricchan/studybuddy/ui/modules/main/MainActivity.kt b/app/src/main/java/com/edricchan/studybuddy/ui/modules/main/MainActivity.kt
index 909af116..bc81b9e5 100644
--- a/app/src/main/java/com/edricchan/studybuddy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/com/edricchan/studybuddy/ui/modules/main/MainActivity.kt
@@ -21,6 +21,13 @@ import com.edricchan.studybuddy.R
 import com.edricchan.studybuddy.constants.Constants
 import com.edricchan.studybuddy.constants.MimeTypeConstants
 import com.edricchan.studybuddy.core.compat.navigation.CompatDestination
+import com.edricchan.studybuddy.core.compat.navigation.auth.navigateToAccountInfo
+import com.edricchan.studybuddy.core.compat.navigation.navigateToCalendar
+import com.edricchan.studybuddy.core.compat.navigation.navigateToDebug
+import com.edricchan.studybuddy.core.compat.navigation.navigateToHelp
+import com.edricchan.studybuddy.core.compat.navigation.navigateToSettings
+import com.edricchan.studybuddy.core.compat.navigation.navigateToTips
+import com.edricchan.studybuddy.core.compat.navigation.task.navigateToTasksList
 import com.edricchan.studybuddy.core.deeplink.AppDeepLink
 import com.edricchan.studybuddy.core.deeplink.WebDeepLink
 import com.edricchan.studybuddy.databinding.ActivityMainBinding
@@ -28,14 +35,7 @@ import com.edricchan.studybuddy.exts.android.startChooser
 import com.edricchan.studybuddy.exts.androidx.preference.defaultSharedPreferences
 import com.edricchan.studybuddy.exts.material.dialog.showMaterialAlertDialog
 import com.edricchan.studybuddy.exts.material.snackbar.showSnackbar
-import com.edricchan.studybuddy.navigation.compat.auth.navigateToAccountInfo
 import com.edricchan.studybuddy.navigation.compat.compatGraphs
-import com.edricchan.studybuddy.navigation.compat.navigateToCalendar
-import com.edricchan.studybuddy.navigation.compat.navigateToDebug
-import com.edricchan.studybuddy.navigation.compat.navigateToHelp
-import com.edricchan.studybuddy.navigation.compat.navigateToSettings
-import com.edricchan.studybuddy.navigation.compat.navigateToTips
-import com.edricchan.studybuddy.navigation.compat.task.navigateToTasksList
 import com.edricchan.studybuddy.ui.common.BaseActivity
 import com.edricchan.studybuddy.ui.common.MainViewModel
 import com.edricchan.studybuddy.ui.modules.main.fragment.showNavBottomSheet
diff --git a/app/src/main/java/com/edricchan/studybuddy/ui/modules/task/fragment/TaskListFragment.kt b/app/src/main/java/com/edricchan/studybuddy/ui/modules/task/fragment/TaskListFragment.kt
index 5c08ccd5..74cb9234 100644
--- a/app/src/main/java/com/edricchan/studybuddy/ui/modules/task/fragment/TaskListFragment.kt
+++ b/app/src/main/java/com/edricchan/studybuddy/ui/modules/task/fragment/TaskListFragment.kt
@@ -22,6 +22,11 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.edricchan.studybuddy.BuildConfig
 import com.edricchan.studybuddy.R
+import com.edricchan.studybuddy.core.compat.navigation.navigateToDebug
+import com.edricchan.studybuddy.core.compat.navigation.navigateToHelp
+import com.edricchan.studybuddy.core.compat.navigation.navigateToSettings
+import com.edricchan.studybuddy.core.compat.navigation.task.navigateToCreateTask
+import com.edricchan.studybuddy.core.compat.navigation.task.navigateToTaskView
 import com.edricchan.studybuddy.databinding.FragTodoBinding
 import com.edricchan.studybuddy.exts.androidx.viewbinding.viewInflateBinding
 import com.edricchan.studybuddy.exts.common.TAG
@@ -32,11 +37,6 @@ import com.edricchan.studybuddy.features.tasks.constants.sharedprefs.TodoOptions
 import com.edricchan.studybuddy.features.tasks.data.model.TodoItem
 import com.edricchan.studybuddy.features.tasks.migrations.TasksMigrator
 import com.edricchan.studybuddy.features.tasks.vm.TasksListViewModel
-import com.edricchan.studybuddy.navigation.compat.navigateToDebug
-import com.edricchan.studybuddy.navigation.compat.navigateToHelp
-import com.edricchan.studybuddy.navigation.compat.navigateToSettings
-import com.edricchan.studybuddy.navigation.compat.task.navigateToCreateTask
-import com.edricchan.studybuddy.navigation.compat.task.navigateToTaskView
 import com.edricchan.studybuddy.ui.common.MainViewModel
 import com.edricchan.studybuddy.ui.common.SnackBarData
 import com.edricchan.studybuddy.ui.dialogs.showAuthRequiredDialog
diff --git a/app/src/main/java/com/edricchan/studybuddy/ui/modules/tips/fragment/TipsFragment.kt b/app/src/main/java/com/edricchan/studybuddy/ui/modules/tips/fragment/TipsFragment.kt
index 8578d812..f177468e 100644
--- a/app/src/main/java/com/edricchan/studybuddy/ui/modules/tips/fragment/TipsFragment.kt
+++ b/app/src/main/java/com/edricchan/studybuddy/ui/modules/tips/fragment/TipsFragment.kt
@@ -15,11 +15,11 @@ import androidx.navigation.fragment.findNavController
 import com.edricchan.studybuddy.BuildConfig
 import com.edricchan.studybuddy.R
 import com.edricchan.studybuddy.constants.Constants
+import com.edricchan.studybuddy.core.compat.navigation.navigateToDebug
+import com.edricchan.studybuddy.core.compat.navigation.navigateToSettings
 import com.edricchan.studybuddy.databinding.FragTipsBinding
 import com.edricchan.studybuddy.exts.androidx.preference.defaultSharedPreferences
 import com.edricchan.studybuddy.exts.androidx.viewbinding.viewInflateBinding
-import com.edricchan.studybuddy.navigation.compat.navigateToDebug
-import com.edricchan.studybuddy.navigation.compat.navigateToSettings
 import com.edricchan.studybuddy.utils.web.launchUri
 
 class TipsFragment : Fragment() {
diff --git a/app/src/main/java/com/edricchan/studybuddy/navigation/compat/CompatNavigationRoutes.kt b/core/compat/navigation/src/main/kotlin/com/edricchan/studybuddy/core/compat/navigation/CompatNavigationRoutes.kt
similarity index 94%
rename from app/src/main/java/com/edricchan/studybuddy/navigation/compat/CompatNavigationRoutes.kt
rename to core/compat/navigation/src/main/kotlin/com/edricchan/studybuddy/core/compat/navigation/CompatNavigationRoutes.kt
index c46ce6b0..d3fe5c77 100644
--- a/app/src/main/java/com/edricchan/studybuddy/navigation/compat/CompatNavigationRoutes.kt
+++ b/core/compat/navigation/src/main/kotlin/com/edricchan/studybuddy/core/compat/navigation/CompatNavigationRoutes.kt
@@ -1,8 +1,7 @@
-package com.edricchan.studybuddy.navigation.compat
+package com.edricchan.studybuddy.core.compat.navigation
 
 import androidx.navigation.NavController
 import androidx.navigation.NavOptionsBuilder
-import com.edricchan.studybuddy.core.compat.navigation.CompatDestination
 
 val DefaultNavOptionsBuilder: NavOptionsBuilder.() -> Unit = {
     launchSingleTop = true
diff --git a/app/src/main/java/com/edricchan/studybuddy/navigation/compat/about/CompatAboutNavRoutes.kt b/core/compat/navigation/src/main/kotlin/com/edricchan/studybuddy/core/compat/navigation/about/CompatAboutNavRoutes.kt
similarity index 86%
rename from app/src/main/java/com/edricchan/studybuddy/navigation/compat/about/CompatAboutNavRoutes.kt
rename to core/compat/navigation/src/main/kotlin/com/edricchan/studybuddy/core/compat/navigation/about/CompatAboutNavRoutes.kt
index 6e618673..06d38ea6 100644
--- a/app/src/main/java/com/edricchan/studybuddy/navigation/compat/about/CompatAboutNavRoutes.kt
+++ b/core/compat/navigation/src/main/kotlin/com/edricchan/studybuddy/core/compat/navigation/about/CompatAboutNavRoutes.kt
@@ -1,9 +1,9 @@
-package com.edricchan.studybuddy.navigation.compat.about
+package com.edricchan.studybuddy.core.compat.navigation.about
 
 import androidx.navigation.NavController
 import androidx.navigation.NavOptionsBuilder
 import com.edricchan.studybuddy.core.compat.navigation.CompatDestination
-import com.edricchan.studybuddy.navigation.compat.DefaultNavOptionsBuilder
+import com.edricchan.studybuddy.core.compat.navigation.DefaultNavOptionsBuilder
 
 /**
  * Navigates to the [CompatDestination.About.ViewLicenses] route.
diff --git a/app/src/main/java/com/edricchan/studybuddy/navigation/compat/auth/CompatAuthNavRoutes.kt b/core/compat/navigation/src/main/kotlin/com/edricchan/studybuddy/core/compat/navigation/auth/CompatAuthNavRoutes.kt
similarity index 92%
rename from app/src/main/java/com/edricchan/studybuddy/navigation/compat/auth/CompatAuthNavRoutes.kt
rename to core/compat/navigation/src/main/kotlin/com/edricchan/studybuddy/core/compat/navigation/auth/CompatAuthNavRoutes.kt
index 820b1eb6..480f0851 100644
--- a/app/src/main/java/com/edricchan/studybuddy/navigation/compat/auth/CompatAuthNavRoutes.kt
+++ b/core/compat/navigation/src/main/kotlin/com/edricchan/studybuddy/core/compat/navigation/auth/CompatAuthNavRoutes.kt
@@ -1,9 +1,9 @@
-package com.edricchan.studybuddy.navigation.compat.auth
+package com.edricchan.studybuddy.core.compat.navigation.auth
 
 import androidx.navigation.NavController
 import androidx.navigation.NavOptionsBuilder
 import com.edricchan.studybuddy.core.compat.navigation.CompatDestination
-import com.edricchan.studybuddy.navigation.compat.DefaultNavOptionsBuilder
+import com.edricchan.studybuddy.core.compat.navigation.DefaultNavOptionsBuilder
 
 /**
  * Navigates to the [CompatDestination.Auth.Account] route.
diff --git a/app/src/main/java/com/edricchan/studybuddy/navigation/compat/task/CompatTaskNavRoutes.kt b/core/compat/navigation/src/main/kotlin/com/edricchan/studybuddy/core/compat/navigation/task/CompatTaskNavRoutes.kt
similarity index 93%
rename from app/src/main/java/com/edricchan/studybuddy/navigation/compat/task/CompatTaskNavRoutes.kt
rename to core/compat/navigation/src/main/kotlin/com/edricchan/studybuddy/core/compat/navigation/task/CompatTaskNavRoutes.kt
index 17821007..7d37f6f7 100644
--- a/app/src/main/java/com/edricchan/studybuddy/navigation/compat/task/CompatTaskNavRoutes.kt
+++ b/core/compat/navigation/src/main/kotlin/com/edricchan/studybuddy/core/compat/navigation/task/CompatTaskNavRoutes.kt
@@ -1,9 +1,9 @@
-package com.edricchan.studybuddy.navigation.compat.task
+package com.edricchan.studybuddy.core.compat.navigation.task
 
 import androidx.navigation.NavController
 import androidx.navigation.NavOptionsBuilder
 import com.edricchan.studybuddy.core.compat.navigation.CompatDestination
-import com.edricchan.studybuddy.navigation.compat.DefaultNavOptionsBuilder
+import com.edricchan.studybuddy.core.compat.navigation.DefaultNavOptionsBuilder
 
 /**
  * Navigates to the [CompatDestination.Task.Root] route.