diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/BaseRouterActivityJava.java b/examples/src/main/java/com/mapbox/navigation/examples/core/BaseRouterActivityJava.java
index 93391d8c6a6..8b25c7e508e 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/BaseRouterActivityJava.java
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/BaseRouterActivityJava.java
@@ -33,7 +33,7 @@
 import com.mapbox.navigation.base.metrics.MetricsObserver;
 import com.mapbox.navigation.base.options.MapboxOnboardRouterConfig;
 import com.mapbox.navigation.base.route.Router;
-import com.mapbox.navigation.core.accounts.MapboxNavigationAccounts;
+import com.mapbox.navigation.core.internal.accounts.MapboxNavigationAccounts;
 import com.mapbox.navigation.examples.R;
 import com.mapbox.navigation.examples.utils.Utils;
 import com.mapbox.navigation.metrics.MapboxMetricsReporter;
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/BaseRouterActivityKt.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/BaseRouterActivityKt.kt
index 3e15b1e5df5..fd16e466962 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/BaseRouterActivityKt.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/BaseRouterActivityKt.kt
@@ -36,7 +36,7 @@ import com.mapbox.navigation.base.metrics.MetricsObserver
 import com.mapbox.navigation.base.options.MapboxOnboardRouterConfig
 import com.mapbox.navigation.base.route.Router
 import com.mapbox.navigation.base.route.internal.RouteUrl.Companion.PROFILE_DRIVING_TRAFFIC
-import com.mapbox.navigation.core.accounts.MapboxNavigationAccounts
+import com.mapbox.navigation.core.internal.accounts.MapboxNavigationAccounts
 import com.mapbox.navigation.examples.R
 import com.mapbox.navigation.examples.utils.Utils
 import com.mapbox.navigation.metrics.MapboxMetricsReporter
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/BasicNavigationActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/BasicNavigationActivity.kt
index 2de0ac0703a..d23576bad0d 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/BasicNavigationActivity.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/BasicNavigationActivity.kt
@@ -22,11 +22,11 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/DebugMapboxNavigationKt.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/DebugMapboxNavigationKt.kt
index eade30b95ff..868d6157b15 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/DebugMapboxNavigationKt.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/DebugMapboxNavigationKt.kt
@@ -37,7 +37,6 @@ import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
 import com.mapbox.navigation.base.options.NavigationOptions
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesObserver
@@ -45,6 +44,7 @@ import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
 import com.mapbox.navigation.core.telemetry.events.FeedbackEvent
 import com.mapbox.navigation.core.trip.session.LocationObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.core.trip.session.VoiceInstructionsObserver
@@ -94,9 +94,9 @@ class DebugMapboxNavigationKt : AppCompatActivity(), OnMapReadyCallback,
         findViewById<Button>(R.id.btn_send_user_feedback)?.let { button ->
             button.setOnClickListener {
                 MapboxNavigation.postUserFeedback(
-                        FeedbackEvent.FEEDBACK_TYPE_GENERAL_ISSUE,
+                        FeedbackEvent.GENERAL_ISSUE,
                         "User feedback test at: ${Date().time}",
-                        FeedbackEvent.FEEDBACK_SOURCE_UI,
+                        FeedbackEvent.UI,
                         null
                 )
             }
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/FasterRouteActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/FasterRouteActivity.kt
index 6961383d599..93f83886729 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/FasterRouteActivity.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/FasterRouteActivity.kt
@@ -24,12 +24,12 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.fasterroute.FasterRouteObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/FeedbackButtonActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/FeedbackButtonActivity.kt
index 746882f4bcd..a1bbf3d2d6a 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/FeedbackButtonActivity.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/FeedbackButtonActivity.kt
@@ -27,7 +27,7 @@ import com.mapbox.navigation.base.internal.extensions.coordinates
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
-import com.mapbox.navigation.core.telemetry.events.FeedbackEvent.Companion.FEEDBACK_SOURCE_UI
+import com.mapbox.navigation.core.telemetry.events.FeedbackEvent.UI
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R
@@ -251,7 +251,7 @@ class FeedbackButtonActivity : AppCompatActivity(), OnMapReadyCallback,
                 MapboxNavigation.postUserFeedback(
                     feedback.feedbackType,
                     feedback.description,
-                    FEEDBACK_SOURCE_UI,
+                    UI,
                     encodeSnapshot(snapshot)
                 )
                 showFeedbackSent()
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/GuidanceViewActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/GuidanceViewActivity.kt
index 1a5a5852cd7..f82ad33e230 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/GuidanceViewActivity.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/GuidanceViewActivity.kt
@@ -18,12 +18,12 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
 import com.mapbox.navigation.core.trip.session.BannerInstructionsObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/InstructionViewActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/InstructionViewActivity.kt
index 3c1d3556032..ca6fc0740fd 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/InstructionViewActivity.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/InstructionViewActivity.kt
@@ -29,13 +29,13 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
-import com.mapbox.navigation.core.telemetry.events.FeedbackEvent.Companion.FEEDBACK_SOURCE_UI
+import com.mapbox.navigation.core.telemetry.events.FeedbackEvent.UI
 import com.mapbox.navigation.core.trip.session.BannerInstructionsObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.core.trip.session.VoiceInstructionsObserver
@@ -196,7 +196,7 @@ class InstructionViewActivity : AppCompatActivity(), OnMapReadyCallback,
                 MapboxNavigation.postUserFeedback(
                     feedback.feedbackType,
                     feedback.description,
-                    FEEDBACK_SOURCE_UI,
+                    UI,
                     encodeSnapshot(snapshot)
                 )
             }
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/ReRouteActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/ReRouteActivity.kt
index 0ad08e26ab4..31bfdb0ed7a 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/ReRouteActivity.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/ReRouteActivity.kt
@@ -22,11 +22,11 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/SimpleMapboxNavigationKt.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/SimpleMapboxNavigationKt.kt
index f82c9844e1c..f3f591b5bcd 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/SimpleMapboxNavigationKt.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/SimpleMapboxNavigationKt.kt
@@ -39,7 +39,6 @@ import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
 import com.mapbox.navigation.base.options.NavigationOptions
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesObserver
@@ -48,6 +47,7 @@ import com.mapbox.navigation.core.fasterroute.FasterRouteObserver
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
 import com.mapbox.navigation.core.telemetry.events.FeedbackEvent
 import com.mapbox.navigation.core.trip.session.LocationObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.core.trip.session.VoiceInstructionsObserver
@@ -103,9 +103,9 @@ class SimpleMapboxNavigationKt : AppCompatActivity(), OnMapReadyCallback,
         findViewById<Button>(R.id.btn_send_user_feedback)?.let { button ->
             button.setOnClickListener {
                 MapboxNavigation.postUserFeedback(
-                    FeedbackEvent.FEEDBACK_TYPE_GENERAL_ISSUE,
+                    FeedbackEvent.GENERAL_ISSUE,
                     "User feedback test at: ${Date().time}",
-                    FeedbackEvent.FEEDBACK_SOURCE_UI,
+                    FeedbackEvent.UI,
                     null
                 )
             }
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/SummaryBottomSheetActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/SummaryBottomSheetActivity.kt
index 0a834d286a2..95b8db4e7d8 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/SummaryBottomSheetActivity.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/SummaryBottomSheetActivity.kt
@@ -27,11 +27,11 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/TripServiceActivityKt.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/TripServiceActivityKt.kt
index 9a94f7ea2a3..221ec7c2029 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/TripServiceActivityKt.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/TripServiceActivityKt.kt
@@ -10,17 +10,17 @@ import com.mapbox.mapboxsdk.geometry.LatLng
 import com.mapbox.mapboxsdk.maps.MapboxMap
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
+import com.mapbox.navigation.base.TimeFormat.TWENTY_FOUR_HOURS
+import com.mapbox.navigation.base.internal.VoiceUnit.METRIC
 import com.mapbox.navigation.base.internal.extensions.inferDeviceLocale
 import com.mapbox.navigation.base.options.NavigationOptions
 import com.mapbox.navigation.base.trip.model.RouteLegProgress
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.base.trip.model.RouteStepProgress
 import com.mapbox.navigation.base.trip.notification.NotificationAction
-import com.mapbox.navigation.base.typedef.METRIC
-import com.mapbox.navigation.base.typedef.ROUNDING_INCREMENT_FIFTY
-import com.mapbox.navigation.base.typedef.TWENTY_FOUR_HOURS
-import com.mapbox.navigation.core.MapboxDistanceFormatter
-import com.mapbox.navigation.core.trip.service.MapboxTripService
+import com.mapbox.navigation.core.Rounding
+import com.mapbox.navigation.core.internal.MapboxDistanceFormatter
+import com.mapbox.navigation.core.internal.trip.service.MapboxTripService
 import com.mapbox.navigation.examples.R
 import com.mapbox.navigation.trip.notification.MapboxTripNotification
 import com.mapbox.navigation.ui.route.NavigationMapRoute
@@ -79,7 +79,7 @@ class TripServiceActivityKt : AppCompatActivity(), OnMapReadyCallback {
         mapView.getMapAsync(this)
 
         val formatter = MapboxDistanceFormatter.builder(this)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(Rounding.INCREMENT_FIFTY)
             .withUnitType(METRIC)
             .withLocale(this.inferDeviceLocale())
             .build()
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/TripSessionActivityKt.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/TripSessionActivityKt.kt
index 6fde16b7331..cc290761ee0 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/core/TripSessionActivityKt.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/core/TripSessionActivityKt.kt
@@ -13,15 +13,15 @@ import com.mapbox.mapboxsdk.location.modes.RenderMode
 import com.mapbox.mapboxsdk.maps.MapboxMap
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
+import com.mapbox.navigation.base.TimeFormat.TWENTY_FOUR_HOURS
+import com.mapbox.navigation.base.internal.VoiceUnit.METRIC
 import com.mapbox.navigation.base.internal.extensions.inferDeviceLocale
 import com.mapbox.navigation.base.options.NavigationOptions
-import com.mapbox.navigation.base.typedef.METRIC
-import com.mapbox.navigation.base.typedef.ROUNDING_INCREMENT_FIFTY
-import com.mapbox.navigation.base.typedef.TWENTY_FOUR_HOURS
-import com.mapbox.navigation.core.MapboxDistanceFormatter
-import com.mapbox.navigation.core.trip.service.MapboxTripService
+import com.mapbox.navigation.core.Rounding
+import com.mapbox.navigation.core.internal.MapboxDistanceFormatter
+import com.mapbox.navigation.core.internal.trip.service.MapboxTripService
+import com.mapbox.navigation.core.internal.trip.session.MapboxTripSession
 import com.mapbox.navigation.core.trip.session.LocationObserver
-import com.mapbox.navigation.core.trip.session.MapboxTripSession
 import com.mapbox.navigation.examples.R
 import com.mapbox.navigation.trip.notification.MapboxTripNotification
 import kotlinx.android.synthetic.main.activity_trip_session.*
@@ -92,7 +92,7 @@ class TripSessionActivityKt : AppCompatActivity(), OnMapReadyCallback {
 
         val formatter = MapboxDistanceFormatter.builder(this)
             .withUnitType(METRIC)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(Rounding.INCREMENT_FIFTY)
             .withLocale(this.inferDeviceLocale())
             .build()
 
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/ui/ArrivalUiBuildingExtrusionActivityKt.kt b/examples/src/main/java/com/mapbox/navigation/examples/ui/ArrivalUiBuildingExtrusionActivityKt.kt
index aa3b950631a..26363e46351 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/ui/ArrivalUiBuildingExtrusionActivityKt.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/ui/ArrivalUiBuildingExtrusionActivityKt.kt
@@ -32,13 +32,13 @@ import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager
 import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.fasterroute.FasterRouteObserver
 import com.mapbox.navigation.core.trip.session.LocationObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/ui/CustomUIComponentStyleActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/ui/CustomUIComponentStyleActivity.kt
index d99a024ce6f..580f8cc7d73 100644
--- a/examples/src/main/java/com/mapbox/navigation/examples/ui/CustomUIComponentStyleActivity.kt
+++ b/examples/src/main/java/com/mapbox/navigation/examples/ui/CustomUIComponentStyleActivity.kt
@@ -33,7 +33,6 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
@@ -41,6 +40,7 @@ import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
 import com.mapbox.navigation.core.telemetry.events.FeedbackEvent
 import com.mapbox.navigation.core.trip.session.BannerInstructionsObserver
 import com.mapbox.navigation.core.trip.session.LocationObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.core.trip.session.VoiceInstructionsObserver
@@ -210,7 +210,7 @@ class CustomUIComponentStyleActivity : AppCompatActivity(), OnMapReadyCallback,
                 MapboxNavigation.postUserFeedback(
                     feedback.feedbackType,
                     feedback.description,
-                    FeedbackEvent.FEEDBACK_SOURCE_UI,
+                    FeedbackEvent.UI,
                     encodeSnapshot(snapshot)
                 )
             }
diff --git a/libnavigation-base/src/main/java/com/mapbox/navigation/base/TimeFormat.kt b/libnavigation-base/src/main/java/com/mapbox/navigation/base/TimeFormat.kt
new file mode 100644
index 00000000000..5e0c6e74847
--- /dev/null
+++ b/libnavigation-base/src/main/java/com/mapbox/navigation/base/TimeFormat.kt
@@ -0,0 +1,46 @@
+package com.mapbox.navigation.base
+
+import androidx.annotation.IntDef
+
+/**
+ * TimeFormat
+ */
+object TimeFormat {
+    /**
+     * Time format: defined by the device's settings
+     *
+     * Used at [Type]
+     */
+    const val NONE_SPECIFIED = -1
+
+    /**
+     * Time format: 12-hour (11.00PM)
+     *
+     * Used at [Type]
+     */
+    const val TWELVE_HOURS = 0
+
+    /**
+     * Time format: 24-hour (23.00)
+     *
+     * Used at [Type]
+     */
+    const val TWENTY_FOUR_HOURS = 1
+
+    /**
+     * Defines time format for calculation remaining trip time.
+     *
+     * When [TWELVE_HOURS] is selected -> 11.00PM
+     *
+     * When [TWENTY_FOUR_HOURS] is selected -> 23.00
+     *
+     * When [NONE_SPECIFIED] is selected -> Depends on user's device settings
+     */
+    @Retention(AnnotationRetention.SOURCE)
+    @IntDef(
+        NONE_SPECIFIED,
+        TWELVE_HOURS,
+        TWENTY_FOUR_HOURS
+    )
+    annotation class Type
+}
diff --git a/libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/VoiceUnit.kt b/libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/VoiceUnit.kt
new file mode 100644
index 00000000000..6c79597f9e7
--- /dev/null
+++ b/libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/VoiceUnit.kt
@@ -0,0 +1,29 @@
+package com.mapbox.navigation.base.internal
+
+import androidx.annotation.StringDef
+
+object VoiceUnit {
+    /**
+     * Change the units to imperial for voice and visual information. Note that this won't change
+     * other results such as raw distance measurements which will always be returned in meters.
+     */
+    const val IMPERIAL = "imperial"
+
+    /**
+     * Change the units to metric for voice and visual information. Note that this won't change
+     * other results such as raw distance measurements which will always be returned in meters.
+     */
+    const val METRIC = "metric"
+
+    /**
+     * Use to apply default units for a locale.
+     */
+    const val UNDEFINED = "undefined"
+
+    /**
+     * Retention policy for the various units of measurements.
+     */
+    @Retention(AnnotationRetention.SOURCE)
+    @StringDef(IMPERIAL, METRIC, UNDEFINED)
+    annotation class Type
+}
diff --git a/libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/extensions/LocaleEx.kt b/libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/extensions/LocaleEx.kt
index bedc426f5ea..9b76fec931a 100644
--- a/libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/extensions/LocaleEx.kt
+++ b/libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/extensions/LocaleEx.kt
@@ -2,9 +2,7 @@ package com.mapbox.navigation.base.internal.extensions
 
 import android.content.Context
 import com.mapbox.api.directions.v5.models.DirectionsRoute
-import com.mapbox.navigation.base.typedef.IMPERIAL
-import com.mapbox.navigation.base.typedef.METRIC
-import com.mapbox.navigation.base.typedef.VoiceUnit
+import com.mapbox.navigation.base.internal.VoiceUnit
 import java.util.Locale
 
 /**
@@ -17,21 +15,21 @@ object LocaleEx {
 
     /**
      * Returns the [VoiceUnit] type for the specified locale. Try to avoid using this unnecessarily because
-     * all methods consuming unit type are able to handle the [com.mapbox.navigation.base.typedef.UNDEFINED] type
+     * all methods consuming unit type are able to handle the [VoiceUnit.UNDEFINED] type
      *
      * @receiver Locale for which to return the default unit type
      * @return String [VoiceUnit]
      */
     @JvmStatic
-    @VoiceUnit
+    @VoiceUnit.Type
     fun Locale.getUnitTypeForLocale(): String =
             when (this.country.toUpperCase(this)) {
                 "US", // US
                 "LR", // Liberia
                 "MM" -> // Burma
-                    IMPERIAL
+                    VoiceUnit.IMPERIAL
                 else ->
-                    METRIC
+                    VoiceUnit.METRIC
             }
 
     /**
diff --git a/libnavigation-base/src/main/java/com/mapbox/navigation/base/options/NavigationOptions.kt b/libnavigation-base/src/main/java/com/mapbox/navigation/base/options/NavigationOptions.kt
index 4f52d86331d..693c25705ef 100644
--- a/libnavigation-base/src/main/java/com/mapbox/navigation/base/options/NavigationOptions.kt
+++ b/libnavigation-base/src/main/java/com/mapbox/navigation/base/options/NavigationOptions.kt
@@ -1,10 +1,7 @@
 package com.mapbox.navigation.base.options
 
+import com.mapbox.navigation.base.TimeFormat
 import com.mapbox.navigation.base.formatter.DistanceFormatter
-import com.mapbox.navigation.base.typedef.NONE_SPECIFIED
-import com.mapbox.navigation.base.typedef.ROUNDING_INCREMENT_FIFTY
-import com.mapbox.navigation.base.typedef.RoundingIncrement
-import com.mapbox.navigation.base.typedef.TimeFormatType
 
 /**
  * Default navigator approximate prediction in milliseconds
@@ -32,8 +29,7 @@ const val DEFAULT_NAVIGATOR_PREDICTION_MILLIS = 1100L
  * @param isDebugLoggingEnabled Boolean
  */
 data class NavigationOptions constructor(
-    @RoundingIncrement val roundingIncrement: Int,
-    @TimeFormatType val timeFormatType: Int,
+    @TimeFormat.Type val timeFormatType: Int,
     val navigatorPredictionMillis: Long,
     val distanceFormatter: DistanceFormatter?,
     val onboardRouterConfig: MapboxOnboardRouterConfig?,
@@ -45,7 +41,6 @@ data class NavigationOptions constructor(
      * Get a builder to customize a subset of current options.
      */
     fun toBuilder() = Builder()
-        .roundingIncrement(roundingIncrement)
         .timeFormatType(timeFormatType)
         .navigatorPredictionMillis(navigatorPredictionMillis)
         .distanceFormatter(distanceFormatter)
@@ -56,20 +51,13 @@ data class NavigationOptions constructor(
      * Build a new [NavigationOptions]
      */
     class Builder {
-        private var roundingIncrement: Int = ROUNDING_INCREMENT_FIFTY
-        private var timeFormatType: Int = NONE_SPECIFIED
+        private var timeFormatType: Int = TimeFormat.NONE_SPECIFIED
         private var navigatorPredictionMillis: Long = DEFAULT_NAVIGATOR_PREDICTION_MILLIS
         private var distanceFormatter: DistanceFormatter? = null
         private var onboardRouterConfig: MapboxOnboardRouterConfig? = null
         private var isFromNavigationUi: Boolean = false
         private var isDebugLoggingEnabled: Boolean = false
 
-        /**
-         * Defines the increment displayed on the instruction view
-         */
-        fun roundingIncrement(roundingIncrement: Int) =
-            apply { this.roundingIncrement = roundingIncrement }
-
         /**
          * Defines time format for calculation remaining trip time
          */
@@ -112,7 +100,6 @@ data class NavigationOptions constructor(
          */
         fun build(): NavigationOptions {
             return NavigationOptions(
-                roundingIncrement = roundingIncrement,
                 timeFormatType = timeFormatType,
                 navigatorPredictionMillis = navigatorPredictionMillis,
                 distanceFormatter = distanceFormatter,
diff --git a/libnavigation-base/src/main/java/com/mapbox/navigation/base/typedef/RoundingIncrement.kt b/libnavigation-base/src/main/java/com/mapbox/navigation/base/typedef/RoundingIncrement.kt
deleted file mode 100644
index 0fca0f60faf..00000000000
--- a/libnavigation-base/src/main/java/com/mapbox/navigation/base/typedef/RoundingIncrement.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mapbox.navigation.base.typedef
-
-import androidx.annotation.IntDef
-
-/**
- * Rounding increment 5
- *
- * Used at [RoundingIncrement]
- */
-const val ROUNDING_INCREMENT_FIVE = 5
-
-/**
- * Rounding increment 10
- *
- * Used at [RoundingIncrement]
- */
-const val ROUNDING_INCREMENT_TEN = 10
-
-/**
- * Rounding increment 25
- *
- * Used at [RoundingIncrement]
- */
-const val ROUNDING_INCREMENT_TWENTY_FIVE = 25
-
-/**
- * Rounding increment 50
- *
- * Used at [RoundingIncrement]
- */
-const val ROUNDING_INCREMENT_FIFTY = 50
-
-/**
- * Rounding increment 100
- *
- * Used at [RoundingIncrement]
- */
-const val ROUNDING_INCREMENT_ONE_HUNDRED = 100
-
-/**
- * Defines the increment displayed on the instruction view
- */
-@Retention(AnnotationRetention.SOURCE)
-@IntDef(
-    ROUNDING_INCREMENT_FIVE,
-    ROUNDING_INCREMENT_TEN,
-    ROUNDING_INCREMENT_TWENTY_FIVE,
-    ROUNDING_INCREMENT_FIFTY,
-    ROUNDING_INCREMENT_ONE_HUNDRED
-)
-annotation class RoundingIncrement
diff --git a/libnavigation-base/src/main/java/com/mapbox/navigation/base/typedef/TimeFormatType.kt b/libnavigation-base/src/main/java/com/mapbox/navigation/base/typedef/TimeFormatType.kt
deleted file mode 100644
index f45c0cdb889..00000000000
--- a/libnavigation-base/src/main/java/com/mapbox/navigation/base/typedef/TimeFormatType.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.mapbox.navigation.base.typedef
-
-import androidx.annotation.IntDef
-
-/**
- * Time format: defined by the device's settings
- *
- * Used at [TimeFormatType]
- */
-const val NONE_SPECIFIED = -1
-
-/**
- * Time format: 12-hour (11.00PM)
- *
- * Used at [TimeFormatType]
- */
-const val TWELVE_HOURS = 0
-
-/**
- * Time format: 24-hour (23.00)
- *
- * Used at [TimeFormatType]
- */
-const val TWENTY_FOUR_HOURS = 1
-
-/**
- * Defines time format for calculation remaining trip time.
- *
- * When [TWELVE_HOURS] is selected -> 11.00PM
- *
- * When [TWENTY_FOUR_HOURS] is selected -> 23.00
- *
- * When [NONE_SPECIFIED] is selected -> Depends on user's device settings
- */
-@Retention(AnnotationRetention.SOURCE)
-@IntDef(
-    NONE_SPECIFIED,
-    TWELVE_HOURS,
-    TWENTY_FOUR_HOURS
-)
-annotation class TimeFormatType
diff --git a/libnavigation-base/src/main/java/com/mapbox/navigation/base/typedef/VoiceUnit.kt b/libnavigation-base/src/main/java/com/mapbox/navigation/base/typedef/VoiceUnit.kt
deleted file mode 100644
index 498927e5afc..00000000000
--- a/libnavigation-base/src/main/java/com/mapbox/navigation/base/typedef/VoiceUnit.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mapbox.navigation.base.typedef
-
-import androidx.annotation.StringDef
-
-/**
- * Change the units to imperial for voice and visual information. Note that this won't change
- * other results such as raw distance measurements which will always be returned in meters.
- */
-const val IMPERIAL = "imperial"
-
-/**
- * Change the units to metric for voice and visual information. Note that this won't change
- * other results such as raw distance measurements which will always be returned in meters.
- */
-const val METRIC = "metric"
-
-/**
- * Use to apply default units for a locale.
- */
-const val UNDEFINED = "undefined"
-
-/**
- * Retention policy for the various units of measurements.
- */
-@Retention(AnnotationRetention.SOURCE)
-@StringDef(IMPERIAL, METRIC, UNDEFINED)
-annotation class VoiceUnit
diff --git a/libnavigation-base/src/test/java/com/mapbox/navigation/base/internal/extensions/LocaleExTest.kt b/libnavigation-base/src/test/java/com/mapbox/navigation/base/internal/extensions/LocaleExTest.kt
index 729a176afc2..132ab5a03a2 100644
--- a/libnavigation-base/src/test/java/com/mapbox/navigation/base/internal/extensions/LocaleExTest.kt
+++ b/libnavigation-base/src/test/java/com/mapbox/navigation/base/internal/extensions/LocaleExTest.kt
@@ -2,9 +2,9 @@ package com.mapbox.navigation.base.internal.extensions
 
 import android.content.Context
 import com.mapbox.api.directions.v5.models.DirectionsRoute
+import com.mapbox.navigation.base.internal.VoiceUnit.IMPERIAL
+import com.mapbox.navigation.base.internal.VoiceUnit.METRIC
 import com.mapbox.navigation.base.internal.extensions.LocaleEx.getUnitTypeForLocale
-import com.mapbox.navigation.base.typedef.IMPERIAL
-import com.mapbox.navigation.base.typedef.METRIC
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
diff --git a/libnavigation-base/src/test/java/com/mapbox/navigation/base/options/NavigationOptionsTest.kt b/libnavigation-base/src/test/java/com/mapbox/navigation/base/options/NavigationOptionsTest.kt
index dd4b28400ea..25f7ebd04c3 100644
--- a/libnavigation-base/src/test/java/com/mapbox/navigation/base/options/NavigationOptionsTest.kt
+++ b/libnavigation-base/src/test/java/com/mapbox/navigation/base/options/NavigationOptionsTest.kt
@@ -1,12 +1,10 @@
 package com.mapbox.navigation.base.options
 
 import android.text.SpannableString
+import com.mapbox.navigation.base.TimeFormat.NONE_SPECIFIED
+import com.mapbox.navigation.base.TimeFormat.TWELVE_HOURS
+import com.mapbox.navigation.base.TimeFormat.TWENTY_FOUR_HOURS
 import com.mapbox.navigation.base.formatter.DistanceFormatter
-import com.mapbox.navigation.base.typedef.NONE_SPECIFIED
-import com.mapbox.navigation.base.typedef.ROUNDING_INCREMENT_FIFTY
-import com.mapbox.navigation.base.typedef.ROUNDING_INCREMENT_TEN
-import com.mapbox.navigation.base.typedef.TWELVE_HOURS
-import com.mapbox.navigation.base.typedef.TWENTY_FOUR_HOURS
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
@@ -16,7 +14,6 @@ class NavigationOptionsTest {
     fun whenBuilderBuildWithNoValuesCalledThenDefaultValuesUsed() {
         val options = NavigationOptions.Builder().build()
 
-        assertEquals(options.roundingIncrement, ROUNDING_INCREMENT_FIFTY)
         assertEquals(options.timeFormatType, NONE_SPECIFIED)
         assertEquals(options.navigatorPredictionMillis, DEFAULT_NAVIGATOR_PREDICTION_MILLIS)
         assertEquals(options.distanceFormatter, null)
@@ -26,7 +23,6 @@ class NavigationOptionsTest {
     @Test
     fun whenBuilderBuildCalledThenProperNavigationOptionsCreated() {
         val timeFormat = TWELVE_HOURS
-        val roundingIncrement = ROUNDING_INCREMENT_TEN
         val navigatorPredictionMillis = 1020L
         val distanceFormatter = object : DistanceFormatter {
             override fun formatDistance(distance: Double): SpannableString {
@@ -37,13 +33,11 @@ class NavigationOptionsTest {
 
         val options = NavigationOptions.Builder()
             .timeFormatType(timeFormat)
-            .roundingIncrement(roundingIncrement)
             .navigatorPredictionMillis(navigatorPredictionMillis)
             .distanceFormatter(distanceFormatter)
             .onboardRouterConfig(routerConfig)
             .build()
 
-        assertEquals(options.roundingIncrement, roundingIncrement)
         assertEquals(options.timeFormatType, timeFormat)
         assertEquals(options.navigatorPredictionMillis, navigatorPredictionMillis)
         assertEquals(options.distanceFormatter, distanceFormatter)
@@ -53,7 +47,6 @@ class NavigationOptionsTest {
     @Test
     fun whenOptionsValuesChangedThenAllOtherValuesSaved() {
         val timeFormat = TWELVE_HOURS
-        val roundingIncrement = ROUNDING_INCREMENT_TEN
         val navigatorPredictionMillis = 1020L
         val distanceFormatter = object : DistanceFormatter {
             override fun formatDistance(distance: Double): SpannableString {
@@ -64,7 +57,6 @@ class NavigationOptionsTest {
 
         var options = NavigationOptions.Builder()
             .timeFormatType(timeFormat)
-            .roundingIncrement(roundingIncrement)
             .navigatorPredictionMillis(navigatorPredictionMillis)
             .distanceFormatter(distanceFormatter)
             .onboardRouterConfig(routerConfig)
@@ -78,7 +70,6 @@ class NavigationOptionsTest {
             .navigatorPredictionMillis(newNavigatorPredictionMillis)
             .build()
 
-        assertEquals(options.roundingIncrement, roundingIncrement)
         assertEquals(options.timeFormatType, newTimeFormat)
         assertEquals(options.navigatorPredictionMillis, newNavigatorPredictionMillis)
         assertEquals(options.distanceFormatter, distanceFormatter)
diff --git a/libnavigation-core/build.gradle b/libnavigation-core/build.gradle
index 71022ad3ac4..78369102a58 100644
--- a/libnavigation-core/build.gradle
+++ b/libnavigation-core/build.gradle
@@ -12,6 +12,11 @@ dokka {
     configuration {
         moduleName = 'libnavigation-core'
         reportUndocumented = true
+
+        perPackageOption {
+            prefix = "com.mapbox.navigation.core.internal"
+            suppress = true
+        }
     }
 }
 
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt
index f83d31f846b..09094107ebe 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt
@@ -15,20 +15,17 @@ import com.mapbox.base.common.logger.Logger
 import com.mapbox.base.common.logger.model.Message
 import com.mapbox.base.common.logger.model.Tag
 import com.mapbox.common.module.provider.MapboxModuleProvider
+import com.mapbox.navigation.base.TimeFormat
+import com.mapbox.navigation.base.internal.VoiceUnit
 import com.mapbox.navigation.base.internal.accounts.SkuTokenProvider
 import com.mapbox.navigation.base.options.DEFAULT_NAVIGATOR_PREDICTION_MILLIS
 import com.mapbox.navigation.base.options.Endpoint
 import com.mapbox.navigation.base.options.MapboxOnboardRouterConfig
 import com.mapbox.navigation.base.options.NavigationOptions
 import com.mapbox.navigation.base.route.Router
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.base.trip.notification.NotificationAction
 import com.mapbox.navigation.base.trip.notification.TripNotification
-import com.mapbox.navigation.base.typedef.NONE_SPECIFIED
-import com.mapbox.navigation.base.typedef.ROUNDING_INCREMENT_FIFTY
-import com.mapbox.navigation.base.typedef.UNDEFINED
-import com.mapbox.navigation.core.accounts.MapboxNavigationAccounts
 import com.mapbox.navigation.core.accounts.NavigationAccountsSession
 import com.mapbox.navigation.core.directions.session.AdjustedRouteOptionsProvider
 import com.mapbox.navigation.core.directions.session.DirectionsSession
@@ -36,16 +33,19 @@ import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.fasterroute.FasterRouteController
 import com.mapbox.navigation.core.fasterroute.FasterRouteObserver
+import com.mapbox.navigation.core.internal.MapboxDistanceFormatter
+import com.mapbox.navigation.core.internal.accounts.MapboxNavigationAccounts
+import com.mapbox.navigation.core.internal.trip.service.TripService
 import com.mapbox.navigation.core.routerefresh.RouteRefreshController
 import com.mapbox.navigation.core.stops.ArrivalController
 import com.mapbox.navigation.core.stops.ArrivalProgressObserver
 import com.mapbox.navigation.core.stops.AutoArrivalController
 import com.mapbox.navigation.core.telemetry.MapboxNavigationTelemetry
 import com.mapbox.navigation.core.telemetry.events.FeedbackEvent
-import com.mapbox.navigation.core.trip.service.TripService
 import com.mapbox.navigation.core.trip.session.BannerInstructionsObserver
 import com.mapbox.navigation.core.trip.session.LocationObserver
 import com.mapbox.navigation.core.trip.session.OffRouteObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSession
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.core.trip.session.VoiceInstructionsObserver
@@ -629,16 +629,16 @@ constructor(
         /**
          * Send user feedback about an issue or problem with the Navigation SDK
          *
-         * @param feedbackType one of [FeedbackEvent.FeedbackType]
+         * @param feedbackType one of [FeedbackEvent.Type]
          * @param description description message
-         * @param feedbackSource one of [FeedbackEvent.FeedbackSource]
+         * @param feedbackSource one of [FeedbackEvent.Source]
          * @param screenshot encoded screenshot (optional)
          */
         @JvmStatic
         fun postUserFeedback(
-            @FeedbackEvent.FeedbackType feedbackType: String,
+            @FeedbackEvent.Type feedbackType: String,
             description: String,
-            @FeedbackEvent.FeedbackSource feedbackSource: String,
+            @FeedbackEvent.Source feedbackSource: String,
             screenshot: String?
         ) {
             MapboxNavigationTelemetry.postUserFeedback(
@@ -657,12 +657,11 @@ constructor(
         @JvmStatic
         fun defaultNavigationOptions(context: Context, accessToken: String?): NavigationOptions {
             val distanceFormatter = MapboxDistanceFormatter.builder(context)
-                .withUnitType(UNDEFINED)
-                .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+                .withUnitType(VoiceUnit.UNDEFINED)
+                .withRoundingIncrement(Rounding.INCREMENT_FIFTY)
                 .build()
             val builder = NavigationOptions.Builder()
-                .timeFormatType(NONE_SPECIFIED)
-                .roundingIncrement(ROUNDING_INCREMENT_FIFTY)
+                .timeFormatType(TimeFormat.NONE_SPECIFIED)
                 .navigatorPredictionMillis(DEFAULT_NAVIGATOR_PREDICTION_MILLIS)
                 .distanceFormatter(distanceFormatter)
 
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/NavigationComponentProvider.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/NavigationComponentProvider.kt
index dfe8b9aacb1..424b2ffa4b2 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/NavigationComponentProvider.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/NavigationComponentProvider.kt
@@ -8,9 +8,9 @@ import com.mapbox.navigation.base.route.Router
 import com.mapbox.navigation.base.trip.notification.TripNotification
 import com.mapbox.navigation.core.directions.session.DirectionsSession
 import com.mapbox.navigation.core.directions.session.MapboxDirectionsSession
-import com.mapbox.navigation.core.trip.service.MapboxTripService
-import com.mapbox.navigation.core.trip.service.TripService
-import com.mapbox.navigation.core.trip.session.MapboxTripSession
+import com.mapbox.navigation.core.internal.trip.service.MapboxTripService
+import com.mapbox.navigation.core.internal.trip.service.TripService
+import com.mapbox.navigation.core.internal.trip.session.MapboxTripSession
 import com.mapbox.navigation.core.trip.session.TripSession
 
 internal object NavigationComponentProvider {
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/Rounding.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/Rounding.kt
new file mode 100644
index 00000000000..a7ebb893bf7
--- /dev/null
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/Rounding.kt
@@ -0,0 +1,56 @@
+package com.mapbox.navigation.core
+
+import androidx.annotation.IntDef
+
+/**
+ * Rounding
+ */
+object Rounding {
+    /**
+     * Rounding increment 5
+     *
+     * Used at [Increment]
+     */
+    const val INCREMENT_FIVE = 5
+
+    /**
+     * Rounding increment 10
+     *
+     * Used at [Increment]
+     */
+    const val INCREMENT_TEN = 10
+
+    /**
+     * Rounding increment 25
+     *
+     * Used at [Increment]
+     */
+    const val INCREMENT_TWENTY_FIVE = 25
+
+    /**
+     * Rounding increment 50
+     *
+     * Used at [Increment]
+     */
+    const val INCREMENT_FIFTY = 50
+
+    /**
+     * Rounding increment 100
+     *
+     * Used at [Increment]
+     */
+    const val INCREMENT_ONE_HUNDRED = 100
+
+    /**
+     * Defines the increment displayed on the instruction view
+     */
+    @Retention(AnnotationRetention.SOURCE)
+    @IntDef(
+        INCREMENT_FIVE,
+        INCREMENT_TEN,
+        INCREMENT_TWENTY_FIVE,
+        INCREMENT_FIFTY,
+        INCREMENT_ONE_HUNDRED
+    )
+    annotation class Increment
+}
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/accounts/MapboxNavigationAccountsProvider.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/accounts/MapboxNavigationAccountsProvider.kt
index 64f3cee6f66..c101169703f 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/accounts/MapboxNavigationAccountsProvider.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/accounts/MapboxNavigationAccountsProvider.kt
@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.pm.ProviderInfo
 import android.database.Cursor
 import android.net.Uri
+import com.mapbox.navigation.core.internal.accounts.MapboxNavigationAccounts
 import com.mapbox.navigation.utils.internal.ifNonNull
 
 internal class MapboxNavigationAccountsProvider : ContentProvider() {
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/accounts/NavigationAccountsSession.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/accounts/NavigationAccountsSession.kt
index f75fa8b2cd7..78eb900f8f9 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/accounts/NavigationAccountsSession.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/accounts/NavigationAccountsSession.kt
@@ -3,6 +3,7 @@ package com.mapbox.navigation.core.accounts
 import android.content.Context
 import com.mapbox.navigation.core.NavigationSession
 import com.mapbox.navigation.core.NavigationSessionStateObserver
+import com.mapbox.navigation.core.internal.accounts.MapboxNavigationAccounts
 
 internal class NavigationAccountsSession(private val context: Context) : NavigationSessionStateObserver {
 
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/directions/session/MapboxDirectionsSession.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/directions/session/MapboxDirectionsSession.kt
index f31d222283c..24ef62c4ab9 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/directions/session/MapboxDirectionsSession.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/directions/session/MapboxDirectionsSession.kt
@@ -7,14 +7,13 @@ import com.mapbox.navigation.base.route.Router
 import com.mapbox.navigation.utils.internal.ifNonNull
 import java.util.concurrent.CopyOnWriteArraySet
 
-// todo make internal
 /**
  * Default implementation of [DirectionsSession].
  *
  * @property router route fetcher. Usually Onboard, Offboard or Hybrid
  * @property routes a list of [DirectionsRoute]. Fetched from [Router] or might be set manually
  */
-class MapboxDirectionsSession(
+internal class MapboxDirectionsSession(
     private val router: Router
 ) : DirectionsSession {
 
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxDistanceFormatter.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/MapboxDistanceFormatter.kt
similarity index 92%
rename from libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxDistanceFormatter.kt
rename to libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/MapboxDistanceFormatter.kt
index 8d5ae2558b3..b29fdff8698 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxDistanceFormatter.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/MapboxDistanceFormatter.kt
@@ -1,4 +1,4 @@
-package com.mapbox.navigation.core
+package com.mapbox.navigation.core.internal
 
 import android.content.Context
 import android.content.res.Resources
@@ -8,12 +8,11 @@ import android.text.Spanned
 import android.text.style.RelativeSizeSpan
 import android.text.style.StyleSpan
 import com.mapbox.navigation.base.formatter.DistanceFormatter
+import com.mapbox.navigation.base.internal.VoiceUnit
 import com.mapbox.navigation.base.internal.extensions.LocaleEx.getUnitTypeForLocale
 import com.mapbox.navigation.base.internal.extensions.inferDeviceLocale
-import com.mapbox.navigation.base.typedef.IMPERIAL
-import com.mapbox.navigation.base.typedef.RoundingIncrement
-import com.mapbox.navigation.base.typedef.UNDEFINED
-import com.mapbox.navigation.base.typedef.VoiceUnit
+import com.mapbox.navigation.core.R
+import com.mapbox.navigation.core.Rounding
 import com.mapbox.turf.TurfConstants
 import com.mapbox.turf.TurfConversion
 import java.text.NumberFormat
@@ -35,17 +34,17 @@ import kotlin.math.roundToInt
 class MapboxDistanceFormatter private constructor(
     private val context: Context,
     private val locale: Locale,
-    @VoiceUnit unitType: String,
-    @RoundingIncrement private val roundingIncrement: Int
+    @VoiceUnit.Type unitType: String,
+    @Rounding.Increment private val roundingIncrement: Int
 ) : DistanceFormatter {
 
     private val smallUnit = when (unitType) {
-        IMPERIAL -> TurfConstants.UNIT_FEET
+        VoiceUnit.IMPERIAL -> TurfConstants.UNIT_FEET
         else -> TurfConstants.UNIT_METERS
     }
 
     private val largeUnit = when (unitType) {
-        IMPERIAL -> TurfConstants.UNIT_MILES
+        VoiceUnit.IMPERIAL -> TurfConstants.UNIT_MILES
         else -> TurfConstants.UNIT_KILOMETERS
     }
 
@@ -77,7 +76,7 @@ class MapboxDistanceFormatter private constructor(
          * @param unitType String
          * @return Builder
          */
-        fun withUnitType(@VoiceUnit unitType: String) =
+        fun withUnitType(@VoiceUnit.Type unitType: String) =
             apply { this.unitType = unitType }
 
         /**
@@ -86,7 +85,7 @@ class MapboxDistanceFormatter private constructor(
          * @see [RoundingIncrement]
          * @return Builder
          */
-        fun withRoundingIncrement(@RoundingIncrement roundingIncrement: Int) =
+        fun withRoundingIncrement(@Rounding.Increment roundingIncrement: Int) =
             apply { this.roundingIncrement = roundingIncrement }
 
         /**
@@ -104,7 +103,7 @@ class MapboxDistanceFormatter private constructor(
             val localeToUse: Locale = locale ?: context.applicationContext.inferDeviceLocale()
             val unitTypeToUse: String = when (unitType) {
                 null -> localeToUse.getUnitTypeForLocale()
-                UNDEFINED -> localeToUse.getUnitTypeForLocale()
+                VoiceUnit.UNDEFINED -> localeToUse.getUnitTypeForLocale()
                 else -> unitType!!
             }
 
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/accounts/MapboxNavigationAccounts.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/accounts/MapboxNavigationAccounts.kt
similarity index 94%
rename from libnavigation-core/src/main/java/com/mapbox/navigation/core/accounts/MapboxNavigationAccounts.kt
rename to libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/accounts/MapboxNavigationAccounts.kt
index e7b162a36a8..55ee2b37a04 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/accounts/MapboxNavigationAccounts.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/accounts/MapboxNavigationAccounts.kt
@@ -1,4 +1,4 @@
-package com.mapbox.navigation.core.accounts
+package com.mapbox.navigation.core.internal.accounts
 
 import android.content.Context
 import android.text.format.DateUtils
@@ -7,9 +7,11 @@ import com.mapbox.android.accounts.navigation.sku.v1.SkuGenerator
 import com.mapbox.android.accounts.v1.AccountsConstants.MAPBOX_SHARED_PREFERENCES
 import com.mapbox.android.accounts.v1.MapboxAccounts
 import com.mapbox.navigation.base.internal.accounts.SkuTokenProvider
+import com.mapbox.navigation.core.accounts.Billing
 import java.lang.IllegalStateException
 
 // TODO: make the class internal
+//  Currently under internal package because it's been used by Router examples in the test app
 /**
  * This class generates and retains the Navigation SDK's SKU token according to internal Mapbox policies
  */
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayLocationConverter.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/replay/route/ReplayLocationConverter.kt
similarity index 96%
rename from libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayLocationConverter.kt
rename to libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/replay/route/ReplayLocationConverter.kt
index bbe5a6918ec..2109595a32d 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayLocationConverter.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/replay/route/ReplayLocationConverter.kt
@@ -1,4 +1,4 @@
-package com.mapbox.navigation.core.replay.route
+package com.mapbox.navigation.core.internal.replay.route
 
 import android.location.Location
 import com.mapbox.api.directions.v5.models.DirectionsRoute
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/MapboxTripService.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/trip/service/MapboxTripService.kt
similarity index 93%
rename from libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/MapboxTripService.kt
rename to libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/trip/service/MapboxTripService.kt
index df079db7251..bcc9577ae4d 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/MapboxTripService.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/trip/service/MapboxTripService.kt
@@ -1,4 +1,4 @@
-package com.mapbox.navigation.core.trip.service
+package com.mapbox.navigation.core.internal.trip.service
 
 import android.app.Service
 import android.content.Context
@@ -6,15 +6,17 @@ import android.content.Intent
 import android.os.Build
 import com.mapbox.base.common.logger.Logger
 import com.mapbox.base.common.logger.model.Message
-import com.mapbox.navigation.base.internal.trip.model.MapboxNotificationData
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.base.trip.notification.TripNotification
+import com.mapbox.navigation.core.trip.service.MapboxNotificationData
+import com.mapbox.navigation.core.trip.service.NavigationNotificationService
 import com.mapbox.navigation.utils.internal.ifChannelException
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.ReceiveChannel
 
 // todo make internal
+//  Currently under internal package because it's been used by TripService examples in the test app
 /**
  * Default [TripService] implementation
  *
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/TripService.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/trip/service/TripService.kt
similarity index 75%
rename from libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/TripService.kt
rename to libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/trip/service/TripService.kt
index ee7c0a6ce5c..41c2a185837 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/TripService.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/trip/service/TripService.kt
@@ -1,9 +1,11 @@
-package com.mapbox.navigation.core.trip.service
+package com.mapbox.navigation.core.internal.trip.service
 
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.trip.session.TripSession
 
 // todo make internal
+//  Currently under internal package because it's been used by MapboxTripSession
+//  which is being used in TripSession examples in the test app
 /**
  * It's a part of [TripSession], interface provides [RouteProgress] to notification bar
  */
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/trip/session/MapboxTripSession.kt
similarity index 94%
rename from libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt
rename to libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/trip/session/MapboxTripSession.kt
index bf708b2582a..dd8023e5103 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/trip/session/MapboxTripSession.kt
@@ -1,4 +1,4 @@
-package com.mapbox.navigation.core.trip.session
+package com.mapbox.navigation.core.internal.trip.session
 
 import android.hardware.SensorEvent
 import android.location.Location
@@ -13,11 +13,20 @@ import com.mapbox.api.directions.v5.models.DirectionsRoute
 import com.mapbox.api.directions.v5.models.VoiceInstructions
 import com.mapbox.base.common.logger.Logger
 import com.mapbox.base.common.logger.model.Message
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteLegProgress
 import com.mapbox.navigation.base.trip.model.RouteProgress
+import com.mapbox.navigation.core.internal.trip.service.TripService
 import com.mapbox.navigation.core.sensors.SensorMapper
-import com.mapbox.navigation.core.trip.service.TripService
+import com.mapbox.navigation.core.trip.session.BannerInstructionEvent
+import com.mapbox.navigation.core.trip.session.BannerInstructionsObserver
+import com.mapbox.navigation.core.trip.session.LocationObserver
+import com.mapbox.navigation.core.trip.session.OffRouteObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
+import com.mapbox.navigation.core.trip.session.TripSession
+import com.mapbox.navigation.core.trip.session.TripSessionState
+import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
+import com.mapbox.navigation.core.trip.session.VoiceInstructionEvent
+import com.mapbox.navigation.core.trip.session.VoiceInstructionsObserver
 import com.mapbox.navigation.navigator.internal.MapboxNativeNavigator
 import com.mapbox.navigation.navigator.internal.MapboxNativeNavigatorImpl
 import com.mapbox.navigation.navigator.internal.TripStatus
@@ -35,6 +44,8 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 // todo make internal
+//  Currently under internal package because it's been used by TripSession examples in the test app
+//  It should be move out of the internal package along with TripService / MapboxTripService
 /**
  * Default implementation of [TripSession]
  *
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayLocationDto.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayLocationDto.kt
deleted file mode 100644
index 72909ebbaa1..00000000000
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayLocationDto.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mapbox.navigation.core.replay.route
-
-import com.google.gson.annotations.JsonAdapter
-import com.google.gson.annotations.SerializedName
-import java.util.Date
-
-internal data class ReplayLocationDto(
-    @SerializedName("lng")
-    var longitude: Double = 0.0,
-    @SerializedName("horizontalAccuracy")
-    var horizontalAccuracyMeters: Float = 0.0f,
-    @SerializedName("course")
-    var bearing: Double = 0.0,
-    @SerializedName("verticalAccuracy")
-    var verticalAccuracyMeters: Float = 0.0f,
-    var speed: Double = 0.0,
-    @SerializedName("lat")
-    var latitude: Double = 0.0,
-    @SerializedName("altitude")
-    var altitude: Double = 0.0,
-    @SerializedName("timestamp")
-    @JsonAdapter(TimestampAdapter::class)
-    var date: Date? = null
-)
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayLocationListener.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayLocationListener.kt
index ef09fbb8601..69103fe2018 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayLocationListener.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayLocationListener.kt
@@ -5,7 +5,7 @@ import android.location.Location
 /**
  * Replay location listener for [ReplayRouteLocationEngine]
  */
-interface ReplayLocationListener {
+internal interface ReplayLocationListener {
 
     /**
      * Called whenever replayed location has updated
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteLocationConverter.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteLocationConverter.kt
index 98fc797aad2..353b2083159 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteLocationConverter.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteLocationConverter.kt
@@ -4,6 +4,7 @@ import android.location.Location
 import com.mapbox.api.directions.v5.models.DirectionsRoute
 import com.mapbox.geojson.LineString
 import com.mapbox.geojson.Point
+import com.mapbox.navigation.core.internal.replay.route.ReplayLocationConverter
 import com.mapbox.turf.TurfConstants
 import com.mapbox.turf.TurfMeasurement
 
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteLocationEngine.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteLocationEngine.kt
index 7db7a4e1998..f268187b616 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteLocationEngine.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteLocationEngine.kt
@@ -13,6 +13,7 @@ import com.mapbox.base.common.logger.Logger
 import com.mapbox.base.common.logger.model.Message
 import com.mapbox.geojson.LineString
 import com.mapbox.geojson.Point
+import com.mapbox.navigation.core.internal.replay.route.ReplayLocationConverter
 import java.util.ArrayList
 
 /**
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/TimestampAdapter.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/TimestampAdapter.kt
deleted file mode 100644
index ecd54869bbf..00000000000
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/TimestampAdapter.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.mapbox.navigation.core.replay.route
-
-import com.google.gson.TypeAdapter
-import com.google.gson.stream.JsonReader
-import com.google.gson.stream.JsonToken
-import com.google.gson.stream.JsonWriter
-import java.io.IOException
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.TimeZone
-
-internal class TimestampAdapter : TypeAdapter<Date>() {
-
-    companion object {
-        private const val DATE_FORMAT_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
-        private val DATE_FORMAT = SimpleDateFormat(DATE_FORMAT_PATTERN)
-        private const val UTC = "UTC"
-    }
-
-    @Throws(IOException::class)
-    override fun write(out: JsonWriter, value: Date?) {
-        if (value == null) {
-            out.nullValue()
-        } else {
-            DATE_FORMAT.timeZone = TimeZone.getTimeZone(
-                UTC
-            )
-            val date = DATE_FORMAT.format(value)
-            out.value(date)
-        }
-    }
-
-    @Throws(IOException::class)
-    override fun read(reader: JsonReader): Date? {
-        if (reader.peek() == JsonToken.NULL) {
-            reader.nextNull()
-            return null
-        }
-
-        val dateAsString = reader.nextString()
-        try {
-            return DATE_FORMAT.parse(dateAsString)
-        } catch (exception: ParseException) {
-            exception.printStackTrace()
-        }
-
-        return null
-    }
-}
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/stops/ArrivalProgressObserver.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/stops/ArrivalProgressObserver.kt
index bb4f69e0369..7d0ac4f4b08 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/stops/ArrivalProgressObserver.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/stops/ArrivalProgressObserver.kt
@@ -1,9 +1,9 @@
 package com.mapbox.navigation.core.stops
 
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteLegProgress
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.base.trip.model.RouteProgressState
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSession
 
 internal class ArrivalProgressObserver(
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetry.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetry.kt
index 293f085f85c..7275eef9a88 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetry.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetry.kt
@@ -17,7 +17,7 @@ import com.mapbox.navigation.core.BuildConfig
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.NavigationSession
 import com.mapbox.navigation.core.NavigationSessionStateObserver
-import com.mapbox.navigation.core.accounts.MapboxNavigationAccounts
+import com.mapbox.navigation.core.internal.accounts.MapboxNavigationAccounts
 import com.mapbox.navigation.core.telemetry.events.FeedbackEvent
 import com.mapbox.navigation.core.telemetry.events.MetricsRouteProgress
 import com.mapbox.navigation.core.telemetry.events.NavigationArriveEvent
@@ -425,9 +425,9 @@ internal object MapboxNavigationTelemetry : MapboxNavigationTelemetryInterface {
      * The method may suspend until it collects 40 location events. The worst case scenario is a 40 location suspension, 20 is best case
      */
     override fun postUserFeedback(
-        @FeedbackEvent.FeedbackType feedbackType: String,
+        @FeedbackEvent.Type feedbackType: String,
         description: String,
-        @FeedbackEvent.FeedbackSource feedbackSource: String,
+        @FeedbackEvent.Source feedbackSource: String,
         screenshot: String?
     ) {
         telemetryThreadControl.scope.launch {
@@ -439,9 +439,9 @@ internal object MapboxNavigationTelemetry : MapboxNavigationTelemetryInterface {
      * Helper class that posts user feedback. The call is available only after initialization
      */
     private fun postUserFeedbackHelper(
-        @FeedbackEvent.FeedbackType feedbackType: String,
+        @FeedbackEvent.Type feedbackType: String,
         description: String,
-        @FeedbackEvent.FeedbackSource feedbackSource: String,
+        @FeedbackEvent.Source feedbackSource: String,
         screenshot: String?
     ) {
         Log.d(TAG, "trying to post a user feedback event")
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetryInterface.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetryInterface.kt
index e08e920291f..58c6b30f8be 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetryInterface.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetryInterface.kt
@@ -5,9 +5,9 @@ import com.mapbox.navigation.core.telemetry.events.FeedbackEvent
 
 internal interface MapboxNavigationTelemetryInterface {
     fun postUserFeedback(
-        @FeedbackEvent.FeedbackType feedbackType: String,
+        @FeedbackEvent.Type feedbackType: String,
         description: String,
-        @FeedbackEvent.FeedbackSource feedbackSource: String,
+        @FeedbackEvent.Source feedbackSource: String,
         screenshot: String?
     )
 
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/TelemetryLocationAndProgressDispatcher.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/TelemetryLocationAndProgressDispatcher.kt
index 7b259e21983..9edb1b63153 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/TelemetryLocationAndProgressDispatcher.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/TelemetryLocationAndProgressDispatcher.kt
@@ -3,7 +3,6 @@ package com.mapbox.navigation.core.telemetry
 import android.location.Location
 import android.util.Log
 import com.mapbox.api.directions.v5.models.DirectionsRoute
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.base.trip.model.RouteProgressState
 import com.mapbox.navigation.core.directions.session.RoutesObserver
@@ -11,6 +10,7 @@ import com.mapbox.navigation.core.telemetry.MapboxNavigationTelemetry.LOCATION_B
 import com.mapbox.navigation.core.telemetry.MapboxNavigationTelemetry.TAG
 import com.mapbox.navigation.core.trip.session.LocationObserver
 import com.mapbox.navigation.core.trip.session.OffRouteObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.utils.internal.ThreadController
 import com.mapbox.navigation.utils.internal.Time
 import com.mapbox.navigation.utils.internal.monitorChannelWithException
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/TelemetryUtils.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/TelemetryUtils.kt
index a3e10143fdd..66a9722be33 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/TelemetryUtils.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/TelemetryUtils.kt
@@ -23,7 +23,7 @@ private const val BRIGHTNESS_EXCEPTION_VALUE = -1
 /**
  * Encode route geometry to *precision 5*
  */
-fun obtainGeometry(directionsRoute: DirectionsRoute?): String =
+internal fun obtainGeometry(directionsRoute: DirectionsRoute?): String =
     ifNonNull(directionsRoute, directionsRoute?.geometry()) { _, geometry ->
         if (TextUtils.isEmpty(geometry)) {
             return@ifNonNull ""
@@ -37,7 +37,7 @@ fun obtainGeometry(directionsRoute: DirectionsRoute?): String =
  *
  * @see [com.mapbox.api.directions.v5.models.LegStep]
  */
-fun obtainStepCount(directionsRoute: DirectionsRoute?): Int =
+internal fun obtainStepCount(directionsRoute: DirectionsRoute?): Int =
     ifNonNull(directionsRoute, directionsRoute?.legs()) { _, legs ->
         var stepCount = 0
         for (leg in legs) {
@@ -51,7 +51,7 @@ fun obtainStepCount(directionsRoute: DirectionsRoute?): Int =
  *
  * @return Int distance unit kilometer
  */
-fun obtainAbsoluteDistance(
+internal fun obtainAbsoluteDistance(
     currentLocation: Location?,
     finalPoint: Point
 ): Int {
@@ -64,14 +64,14 @@ fun obtainAbsoluteDistance(
 /**
  * Provide the last [Point] in a [DirectionsRoute]
  */
-fun obtainRouteDestination(route: DirectionsRoute?): Point =
+internal fun obtainRouteDestination(route: DirectionsRoute?): Point =
     route?.legs()?.lastOrNull()?.steps()?.lastOrNull()?.maneuver()?.location()
         ?: Point.fromLngLat(0.0, 0.0)
 
 /**
  * Provide the volume level in the percentages(range is *0..100*)
  */
-fun obtainVolumeLevel(context: Context): Int {
+internal fun obtainVolumeLevel(context: Context): Int {
     val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
     return floor(
         PERCENT_NORMALIZER * audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) /
@@ -82,7 +82,7 @@ fun obtainVolumeLevel(context: Context): Int {
 /**
  * Provide screen brightness in range *0..100*
  */
-fun obtainScreenBrightness(context: Context): Int =
+internal fun obtainScreenBrightness(context: Context): Int =
     try {
         val systemScreenBrightness = Settings.System.getInt(
             context.contentResolver,
@@ -97,7 +97,7 @@ fun obtainScreenBrightness(context: Context): Int =
  * Provide audio type
  * @see [com.mapbox.navigation.core.telemetry.audio.AudioTypeResolver]
  */
-fun obtainAudioType(context: Context): String =
+internal fun obtainAudioType(context: Context): String =
     AudioTypeChain().setup().obtainAudioType(context)
 
 private fun calculateScreenBrightnessPercentage(screenBrightness: Int): Int =
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/events/FeedbackEvent.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/events/FeedbackEvent.kt
index 9f1fc6f7ee2..cf54388906d 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/events/FeedbackEvent.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/events/FeedbackEvent.kt
@@ -7,255 +7,255 @@ import androidx.annotation.StringDef
  *
  * This event occurs if the user taps a feedback button in the navigation app indicating there was a problem.
  */
-class FeedbackEvent {
-    companion object {
-        /**
-         * Feedback type *general*: when no one else is not fit or actually *general* feedback
-         */
-        const val FEEDBACK_TYPE_GENERAL_ISSUE = "general"
-
-        /**
-         * Feedback type *accident*: crash, uneven surface, etc
-         */
-        const val FEEDBACK_TYPE_ACCIDENT = "accident"
-
-        /**
-         * Feedback type *hazard*: such as debris, stopped vehicles, etc
-         */
-        const val FEEDBACK_TYPE_HAZARD = "hazard"
-
-        /**
-         * Feedback type *road closed*: closed road or one that does not allow vehicles
-         */
-        const val FEEDBACK_TYPE_ROAD_CLOSED = "road_closed"
-
-        /**
-         * Feedback type *not allowed*: a turn/maneuver that isn't allowed
-         */
-        const val FEEDBACK_TYPE_NOT_ALLOWED = "not_allowed"
-
-        /**
-         * Feedback type *routing error*: poor instruction or route choice
-         * (ambiguous or poorly-timed turn announcement, or a set of confusing turns)
-         */
-        const val FEEDBACK_TYPE_ROUTING_ERROR = "routing_error"
-
-        /**
-         * Feedback type *missing road*: road doesn't exist
-         */
-        const val FEEDBACK_TYPE_MISSING_ROAD = "missing_road"
-
-        /**
-         * Feedback type *missing exit*: dead end
-         */
-        const val FEEDBACK_TYPE_MISSING_EXIT = "missing_exit"
-
-        /**
-         * Feedback type *confusing instruction*: wrong voice/text instruction
-         */
-        const val FEEDBACK_TYPE_CONFUSING_INSTRUCTION = "confusing_instruction"
-
-        /**
-         * Feedback type *inaccurate gps*: wrong location of navigation puck on the map
-         */
-        const val FEEDBACK_TYPE_INACCURATE_GPS = "inaccurate_gps"
-
-        /**
-         * Feedback type *incorrect visual guidance*: wrong visual guidance
-         */
-        const val FEEDBACK_TYPE_INCORRECT_VISUAL_GUIDANCE = "incorrect_visual_guidance"
-
-        /**
-         * Feedback type *incorrect audio guidance*: wrong audio guidance
-         */
-        const val FEEDBACK_TYPE_INCORRECT_AUDIO_GUIDANCE = "incorrect_audio_guidance"
-
-        /**
-         * Feedback source *reroute*: the user tapped a feedback button in response to a reroute
-         */
-        const val FEEDBACK_SOURCE_REROUTE = "reroute"
-
-        /**
-         * Feedback source *user*: the user tapped a feedback button
-         */
-        const val FEEDBACK_SOURCE_UI = "user"
-
-        /**
-         * Feedback description for *incorrect visual guidance*: turn icon incorrect
-         */
-        const val FEEDBACK_DESCRIPTION_TURN_ICON_INCORRECT = "turn_icon_incorrect"
-
-        /**
-         * Feedback description for *incorrect visual guidance*: street name incorrect
-         */
-        const val FEEDBACK_DESCRIPTION_STREET_NAME_INCORRECT = "street_name_incorrect"
-
-        /**
-         * Feedback description for *incorrect visual guidance*: instruction unnecessary
-         */
-        const val FEEDBACK_DESCRIPTION_INSTRUCTION_UNNECESSARY = "instruction_unnecessary"
-
-        /**
-         * Feedback description for *incorrect visual guidance*: instruction missing
-         */
-        const val FEEDBACK_DESCRIPTION_INSTRUCTION_MISSING = "instruction_missing"
-
-        /**
-         * Feedback description for *incorrect visual guidance*: maneuver incorrect
-         */
-        const val FEEDBACK_DESCRIPTION_MANEUVER_INCORRECT = "maneuver_incorrect"
-
-        /**
-         * Feedback description for *incorrect visual guidance*: exit info incorrect
-         */
-        const val FEEDBACK_DESCRIPTION_EXIT_INFO_INCORRECT = "exit_info_incorrect"
-
-        /**
-         * Feedback description for *incorrect visual guidance*: lane guidance incorrect
-         */
-        const val FEEDBACK_DESCRIPTION_LANE_GUIDANCE_INCORRECT = "lane_guidance_incorrect"
-
-        /**
-         * Feedback description for *incorrect visual guidance*: road know by different name
-         */
-        const val FEEDBACK_DESCRIPTION_ROAD_KNOW_BY_DIFFERENT_NAME = "road_know_by_different_name"
-
-        /**
-         * Feedback description for *incorrect audio guidance*: guidance too early
-         */
-        const val FEEDBACK_DESCRIPTION_GUIDANCE_TOO_EARLY = "guidance_too_early"
-
-        /**
-         * Feedback description for *incorrect audio guidance*: guidance too late
-         */
-        const val FEEDBACK_DESCRIPTION_GUIDANCE_TOO_LATE = "guidance_too_late"
-
-        /**
-         * Feedback description for *incorrect audio guidance*: pronunciation incorrect
-         */
-        const val FEEDBACK_DESCRIPTION_PRONUNCIATION_INCORRECT = "pronunciation_incorrect"
-
-        /**
-         * Feedback description for *incorrect audio guidance*: road name repeated
-         */
-        const val FEEDBACK_DESCRIPTION_ROAD_NAME_REPEATED = "road_name_repeated"
-
-        /**
-         * Feedback description for *routing error*: route not drive-able
-         */
-        const val FEEDBACK_DESCRIPTION_ROUTE_NOT_DRIVE_ABLE = "route_not_drive_able"
-
-        /**
-         * Feedback description for *routing error*: route not preferred
-         */
-        const val FEEDBACK_DESCRIPTION_ROUTE_NOT_PREFERRED = "route_not_preferred"
-
-        /**
-         * Feedback description for *routing error*: alternative route not expected
-         */
-        const val FEEDBACK_DESCRIPTION_ALTERNATIVE_ROUTE_NOT_EXPECTED =
-            "alternative_route_not_expected"
-
-        /**
-         * Feedback description for *routing error*: route included missing roads
-         */
-        const val FEEDBACK_DESCRIPTION_ROUTE_INCLUDED_MISSING_ROADS = "route_included_missing_roads"
-
-        /**
-         * Feedback description for *routing error*: route had roads too narrow to pass
-         */
-        const val FEEDBACK_DESCRIPTION_ROUTE_HAD_ROADS_TOO_NARROW_TO_PASS =
-            "route_had_roads_too_narrow_to_pass"
-
-        /**
-         * Feedback description for *routing error*: routed down a one-way
-         */
-        const val FEEDBACK_DESCRIPTION_ROUTED_DOWN_A_ONE_WAY = "routed_down_a_one_way"
-
-        /**
-         * Feedback description for *routing error*: turn was not allowed
-         */
-        const val FEEDBACK_DESCRIPTION_TURN_WAS_NOT_ALLOWED = "turn_was_not_allowed"
-
-        /**
-         * Feedback description for *routing error*: cars not allowed on street
-         */
-        const val FEEDBACK_DESCRIPTION_CARS_NOT_ALLOWED_ON_STREET = "cars_not_allowed_on_street"
-
-        /**
-         * Feedback description for *routing error*: turn at intersection was unprotected
-         */
-        const val FEEDBACK_DESCRIPTION_TURN_AT_INTERSECTION_WAS_UNPROTECTED =
-            "turn_at_intersection_was_unprotected"
-
-        /**
-         * Feedback description for *routing error*: street permanently blocked off
-         */
-        const val FEEDBACK_DESCRIPTION_STREET_PERMANENTLY_BLOCKED_OFF =
-            "street_permanently_blocked_off"
-
-        /**
-         * Feedback description for *routing error*: road is missing from map
-         */
-        const val FEEDBACK_DESCRIPTION_ROAD_IS_MISSING_FROM_MAP = "road_is_missing_from_map"
-    }
+object FeedbackEvent {
+    /**
+     * Feedback type *general*: when no one else is not fit or actually *general* feedback
+     */
+    const val GENERAL_ISSUE = "general"
+
+    /**
+     * Feedback type *accident*: crash, uneven surface, etc
+     */
+    const val ACCIDENT = "accident"
+
+    /**
+     * Feedback type *hazard*: such as debris, stopped vehicles, etc
+     */
+    const val HAZARD = "hazard"
+
+    /**
+     * Feedback type *road closed*: closed road or one that does not allow vehicles
+     */
+    const val ROAD_CLOSED = "road_closed"
+
+    /**
+     * Feedback type *not allowed*: a turn/maneuver that isn't allowed
+     */
+    const val NOT_ALLOWED = "not_allowed"
+
+    /**
+     * Feedback type *routing error*: poor instruction or route choice
+     * (ambiguous or poorly-timed turn announcement, or a set of confusing turns)
+     */
+    const val ROUTING_ERROR = "routing_error"
+
+    /**
+     * Feedback type *missing road*: road doesn't exist
+     */
+    const val MISSING_ROAD = "missing_road"
+
+    /**
+     * Feedback type *missing exit*: dead end
+     */
+    const val MISSING_EXIT = "missing_exit"
+
+    /**
+     * Feedback type *confusing instruction*: wrong voice/text instruction
+     */
+    const val CONFUSING_INSTRUCTION = "confusing_instruction"
+
+    /**
+     * Feedback type *inaccurate gps*: wrong location of navigation puck on the map
+     */
+    const val INACCURATE_GPS = "inaccurate_gps"
+
+    /**
+     * Feedback type *incorrect visual guidance*: wrong visual guidance
+     */
+    const val INCORRECT_VISUAL_GUIDANCE = "incorrect_visual_guidance"
+
+    /**
+     * Feedback type *incorrect audio guidance*: wrong audio guidance
+     */
+    const val INCORRECT_AUDIO_GUIDANCE = "incorrect_audio_guidance"
+
+    /**
+     * Feedback source *reroute*: the user tapped a feedback button in response to a reroute
+     */
+    const val REROUTE = "reroute"
+
+    /**
+     * Feedback source *user*: the user tapped a feedback button
+     */
+    const val UI = "user"
+
+    /**
+     * Feedback description for *incorrect visual guidance*: turn icon incorrect
+     */
+    const val TURN_ICON_INCORRECT = "turn_icon_incorrect"
+
+    /**
+     * Feedback description for *incorrect visual guidance*: street name incorrect
+     */
+    const val STREET_NAME_INCORRECT = "street_name_incorrect"
+
+    /**
+     * Feedback description for *incorrect visual guidance*: instruction unnecessary
+     */
+    const val INSTRUCTION_UNNECESSARY = "instruction_unnecessary"
+
+    /**
+     * Feedback description for *incorrect visual guidance*: instruction missing
+     */
+    const val INSTRUCTION_MISSING = "instruction_missing"
+
+    /**
+     * Feedback description for *incorrect visual guidance*: maneuver incorrect
+     */
+    const val MANEUVER_INCORRECT = "maneuver_incorrect"
+
+    /**
+     * Feedback description for *incorrect visual guidance*: exit info incorrect
+     */
+    const val EXIT_INFO_INCORRECT = "exit_info_incorrect"
+
+    /**
+     * Feedback description for *incorrect visual guidance*: lane guidance incorrect
+     */
+    const val LANE_GUIDANCE_INCORRECT = "lane_guidance_incorrect"
+
+    /**
+     * Feedback description for *incorrect visual guidance*: road know by different name
+     */
+    const val ROAD_KNOW_BY_DIFFERENT_NAME = "road_know_by_different_name"
+
+    /**
+     * Feedback description for *incorrect audio guidance*: guidance too early
+     */
+    const val GUIDANCE_TOO_EARLY = "guidance_too_early"
+
+    /**
+     * Feedback description for *incorrect audio guidance*: guidance too late
+     */
+    const val GUIDANCE_TOO_LATE = "guidance_too_late"
+
+    /**
+     * Feedback description for *incorrect audio guidance*: pronunciation incorrect
+     */
+    const val PRONUNCIATION_INCORRECT = "pronunciation_incorrect"
+
+    /**
+     * Feedback description for *incorrect audio guidance*: road name repeated
+     */
+    const val ROAD_NAME_REPEATED = "road_name_repeated"
+
+    /**
+     * Feedback description for *routing error*: route not drive-able
+     */
+    const val ROUTE_NOT_DRIVE_ABLE = "route_not_drive_able"
+
+    /**
+     * Feedback description for *routing error*: route not preferred
+     */
+    const val ROUTE_NOT_PREFERRED = "route_not_preferred"
+
+    /**
+     * Feedback description for *routing error*: alternative route not expected
+     */
+    const val ALTERNATIVE_ROUTE_NOT_EXPECTED =
+        "alternative_route_not_expected"
+
+    /**
+     * Feedback description for *routing error*: route included missing roads
+     */
+    const val ROUTE_INCLUDED_MISSING_ROADS = "route_included_missing_roads"
+
+    /**
+     * Feedback description for *routing error*: route had roads too narrow to pass
+     */
+    const val ROUTE_HAD_ROADS_TOO_NARROW_TO_PASS =
+        "route_had_roads_too_narrow_to_pass"
+
+    /**
+     * Feedback description for *routing error*: routed down a one-way
+     */
+    const val ROUTED_DOWN_A_ONE_WAY = "routed_down_a_one_way"
+
+    /**
+     * Feedback description for *routing error*: turn was not allowed
+     */
+    const val TURN_WAS_NOT_ALLOWED = "turn_was_not_allowed"
+
+    /**
+     * Feedback description for *routing error*: cars not allowed on street
+     */
+    const val CARS_NOT_ALLOWED_ON_STREET = "cars_not_allowed_on_street"
+
+    /**
+     * Feedback description for *routing error*: turn at intersection was unprotected
+     */
+    const val TURN_AT_INTERSECTION_WAS_UNPROTECTED =
+        "turn_at_intersection_was_unprotected"
+
+    /**
+     * Feedback description for *routing error*: street permanently blocked off
+     */
+    const val STREET_PERMANENTLY_BLOCKED_OFF =
+        "street_permanently_blocked_off"
+
+    /**
+     * Feedback description for *routing error*: road is missing from map
+     */
+    const val ROAD_IS_MISSING_FROM_MAP = "road_is_missing_from_map"
 
     /**
      * Type of feedback mean WHAT happen
      */
     @Retention(AnnotationRetention.SOURCE)
     @StringDef(
-        FEEDBACK_TYPE_GENERAL_ISSUE,
-        FEEDBACK_TYPE_ACCIDENT,
-        FEEDBACK_TYPE_HAZARD,
-        FEEDBACK_TYPE_ROAD_CLOSED,
-        FEEDBACK_TYPE_NOT_ALLOWED,
-        FEEDBACK_TYPE_ROUTING_ERROR,
-        FEEDBACK_TYPE_CONFUSING_INSTRUCTION,
-        FEEDBACK_TYPE_INACCURATE_GPS,
-        FEEDBACK_TYPE_MISSING_ROAD,
-        FEEDBACK_TYPE_MISSING_EXIT
+        GENERAL_ISSUE,
+        ACCIDENT,
+        HAZARD,
+        ROAD_CLOSED,
+        NOT_ALLOWED,
+        ROUTING_ERROR,
+        MISSING_ROAD,
+        MISSING_EXIT,
+        CONFUSING_INSTRUCTION,
+        INACCURATE_GPS,
+        INCORRECT_VISUAL_GUIDANCE,
+        INCORRECT_AUDIO_GUIDANCE
     )
-    annotation class FeedbackType
+    annotation class Type
 
     /**
      * Feedback source mean WHERE happen
      */
     @Retention(AnnotationRetention.SOURCE)
     @StringDef(
-        FEEDBACK_SOURCE_REROUTE,
-        FEEDBACK_SOURCE_UI
+        REROUTE,
+        UI
     )
-    annotation class FeedbackSource
+    annotation class Source
 
     /**
      * Detail description for different feedback type
      */
     @Retention(AnnotationRetention.SOURCE)
     @StringDef(
-        FEEDBACK_DESCRIPTION_TURN_ICON_INCORRECT,
-        FEEDBACK_DESCRIPTION_STREET_NAME_INCORRECT,
-        FEEDBACK_DESCRIPTION_INSTRUCTION_UNNECESSARY,
-        FEEDBACK_DESCRIPTION_INSTRUCTION_MISSING,
-        FEEDBACK_DESCRIPTION_MANEUVER_INCORRECT,
-        FEEDBACK_DESCRIPTION_EXIT_INFO_INCORRECT,
-        FEEDBACK_DESCRIPTION_LANE_GUIDANCE_INCORRECT,
-        FEEDBACK_DESCRIPTION_ROAD_KNOW_BY_DIFFERENT_NAME,
-        FEEDBACK_DESCRIPTION_GUIDANCE_TOO_EARLY,
-        FEEDBACK_DESCRIPTION_GUIDANCE_TOO_LATE,
-        FEEDBACK_DESCRIPTION_PRONUNCIATION_INCORRECT,
-        FEEDBACK_DESCRIPTION_ROAD_NAME_REPEATED,
-        FEEDBACK_DESCRIPTION_ROUTE_NOT_DRIVE_ABLE,
-        FEEDBACK_DESCRIPTION_ROUTE_NOT_PREFERRED,
-        FEEDBACK_DESCRIPTION_ALTERNATIVE_ROUTE_NOT_EXPECTED,
-        FEEDBACK_DESCRIPTION_ROUTE_INCLUDED_MISSING_ROADS,
-        FEEDBACK_DESCRIPTION_ROUTE_HAD_ROADS_TOO_NARROW_TO_PASS,
-        FEEDBACK_DESCRIPTION_ROUTED_DOWN_A_ONE_WAY,
-        FEEDBACK_DESCRIPTION_TURN_WAS_NOT_ALLOWED,
-        FEEDBACK_DESCRIPTION_CARS_NOT_ALLOWED_ON_STREET,
-        FEEDBACK_DESCRIPTION_TURN_AT_INTERSECTION_WAS_UNPROTECTED,
-        FEEDBACK_DESCRIPTION_STREET_PERMANENTLY_BLOCKED_OFF,
-        FEEDBACK_DESCRIPTION_ROAD_IS_MISSING_FROM_MAP
+        TURN_ICON_INCORRECT,
+        STREET_NAME_INCORRECT,
+        INSTRUCTION_UNNECESSARY,
+        INSTRUCTION_MISSING,
+        MANEUVER_INCORRECT,
+        EXIT_INFO_INCORRECT,
+        LANE_GUIDANCE_INCORRECT,
+        ROAD_KNOW_BY_DIFFERENT_NAME,
+        GUIDANCE_TOO_EARLY,
+        GUIDANCE_TOO_LATE,
+        PRONUNCIATION_INCORRECT,
+        ROAD_NAME_REPEATED,
+        ROUTE_NOT_DRIVE_ABLE,
+        ROUTE_NOT_PREFERRED,
+        ALTERNATIVE_ROUTE_NOT_EXPECTED,
+        ROUTE_INCLUDED_MISSING_ROADS,
+        ROUTE_HAD_ROADS_TOO_NARROW_TO_PASS,
+        ROUTED_DOWN_A_ONE_WAY,
+        TURN_WAS_NOT_ALLOWED,
+        CARS_NOT_ALLOWED_ON_STREET,
+        TURN_AT_INTERSECTION_WAS_UNPROTECTED,
+        STREET_PERMANENTLY_BLOCKED_OFF,
+        ROAD_IS_MISSING_FROM_MAP
     )
-    annotation class FeedbackDescription
+    annotation class Description
 }
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/events/TelemetryEvent.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/events/TelemetryEvent.kt
index bced2817bc9..62647b077c0 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/events/TelemetryEvent.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/events/TelemetryEvent.kt
@@ -1,8 +1,6 @@
 package com.mapbox.navigation.core.telemetry.events
 
 internal interface TelemetryEvent {
-
     val eventId: String
-
     val sessionState: SessionState
 }
diff --git a/libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/trip/model/MapboxNotificationData.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/MapboxNotificationData.kt
similarity index 80%
rename from libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/trip/model/MapboxNotificationData.kt
rename to libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/MapboxNotificationData.kt
index 73ec1ec31e5..adddf00e23c 100644
--- a/libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/trip/model/MapboxNotificationData.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/MapboxNotificationData.kt
@@ -1,4 +1,4 @@
-package com.mapbox.navigation.base.internal.trip.model
+package com.mapbox.navigation.core.trip.service
 
 import android.app.Notification
 import com.mapbox.navigation.base.trip.notification.TripNotification
@@ -9,7 +9,7 @@ import com.mapbox.navigation.base.trip.notification.TripNotification
  * @param notificationId ID of displayed notification
  * @param notification [Notification] object for displayed notification
  */
-data class MapboxNotificationData(
+internal data class MapboxNotificationData(
     val notificationId: Int,
     val notification: Notification
 )
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/NavigationNotificationService.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/NavigationNotificationService.kt
index fe5c0453b9c..ac98842e597 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/NavigationNotificationService.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/service/NavigationNotificationService.kt
@@ -5,6 +5,7 @@ import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.os.IBinder
+import com.mapbox.navigation.core.internal.trip.service.MapboxTripService
 import com.mapbox.navigation.core.telemetry.MapboxNavigationTelemetry
 import com.mapbox.navigation.utils.internal.ThreadController
 import com.mapbox.navigation.utils.internal.monitorChannelWithException
@@ -13,7 +14,7 @@ import kotlinx.coroutines.cancelChildren
 /**
  * Service is updating information about current trip
  */
-class NavigationNotificationService : Service() {
+internal class NavigationNotificationService : Service() {
     private val ioJobController by lazy {
         ThreadController.getIOScopeAndRootJob()
     }
diff --git a/libnavigation-base/src/main/java/com/mapbox/navigation/base/trip/RouteProgressObserver.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/RouteProgressObserver.kt
similarity index 88%
rename from libnavigation-base/src/main/java/com/mapbox/navigation/base/trip/RouteProgressObserver.kt
rename to libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/RouteProgressObserver.kt
index 44c09bf69e6..c8923ae96c2 100644
--- a/libnavigation-base/src/main/java/com/mapbox/navigation/base/trip/RouteProgressObserver.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/RouteProgressObserver.kt
@@ -1,4 +1,4 @@
-package com.mapbox.navigation.base.trip
+package com.mapbox.navigation.core.trip.session
 
 import com.mapbox.navigation.base.trip.model.RouteProgress
 
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/TripSession.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/TripSession.kt
index 119416a132a..6b1580f929e 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/TripSession.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/TripSession.kt
@@ -5,9 +5,8 @@ import android.location.Location
 import com.mapbox.android.core.location.LocationEngine
 import com.mapbox.android.core.location.LocationEngineRequest
 import com.mapbox.api.directions.v5.models.DirectionsRoute
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
-import com.mapbox.navigation.core.trip.service.TripService
+import com.mapbox.navigation.core.internal.trip.service.TripService
 import com.mapbox.navigator.NavigationStatus
 
 internal interface TripSession {
diff --git a/libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxNavigationTest.kt b/libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxNavigationTest.kt
index 3b2d2dccd1c..f94ddafb98b 100644
--- a/libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxNavigationTest.kt
+++ b/libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxNavigationTest.kt
@@ -14,18 +14,19 @@ import com.mapbox.api.directions.v5.models.RouteOptions
 import com.mapbox.base.common.logger.Logger
 import com.mapbox.common.module.provider.MapboxModuleProvider
 import com.mapbox.geojson.Point
+import com.mapbox.navigation.base.TimeFormat.NONE_SPECIFIED
 import com.mapbox.navigation.base.internal.extensions.inferDeviceLocale
 import com.mapbox.navigation.base.options.MapboxOnboardRouterConfig
 import com.mapbox.navigation.base.options.NavigationOptions
 import com.mapbox.navigation.base.route.Router
 import com.mapbox.navigation.base.route.internal.RouteUrl
 import com.mapbox.navigation.base.trip.model.RouteProgress
-import com.mapbox.navigation.base.typedef.NONE_SPECIFIED
 import com.mapbox.navigation.core.directions.session.AdjustedRouteOptionsProvider
 import com.mapbox.navigation.core.directions.session.DirectionsSession
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
-import com.mapbox.navigation.core.trip.service.TripService
+import com.mapbox.navigation.core.internal.MapboxDistanceFormatter
+import com.mapbox.navigation.core.internal.trip.service.TripService
 import com.mapbox.navigation.core.trip.session.OffRouteObserver
 import com.mapbox.navigation.core.trip.session.TripSession
 import com.mapbox.navigation.testing.MainCoroutineRule
@@ -131,7 +132,6 @@ class MapboxNavigationTest {
             .distanceFormatter(distanceFormatter)
             .navigatorPredictionMillis(1500L)
             .onboardRouterConfig(onBoardRouterConfig)
-            .roundingIncrement(1)
             .timeFormatType(NONE_SPECIFIED)
             .build()
 
diff --git a/libnavigation-core/src/test/java/com/mapbox/navigation/core/ThreadControllerTest.kt b/libnavigation-core/src/test/java/com/mapbox/navigation/core/ThreadControllerTest.kt
deleted file mode 100644
index f4fc4e95390..00000000000
--- a/libnavigation-core/src/test/java/com/mapbox/navigation/core/ThreadControllerTest.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mapbox.navigation.core
-
-import com.mapbox.navigation.utils.internal.ThreadController
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-const val MAX_COROUTINES = 10
-const val MAX_DELAY = 100L
-
-class ThreadControllerTest {
-    @Test
-    fun jobCountValidationNonUIScope() {
-        val jobControl = ThreadController.getIOScopeAndRootJob()
-        (0 until MAX_COROUTINES).forEach {
-            jobControl.scope.launch {
-                delay(MAX_DELAY)
-            }
-        }
-        assertTrue(jobControl.job.children.count() == MAX_COROUTINES)
-        jobControl.job.cancel()
-        assertTrue(jobControl.job.isCancelled)
-    }
-}
diff --git a/libnavigation-core/src/test/java/com/mapbox/navigation/core/accounts/MapboxNavigationAccountsTest.kt b/libnavigation-core/src/test/java/com/mapbox/navigation/core/accounts/MapboxNavigationAccountsTest.kt
index 5c993667cf5..699c8f734f1 100644
--- a/libnavigation-core/src/test/java/com/mapbox/navigation/core/accounts/MapboxNavigationAccountsTest.kt
+++ b/libnavigation-core/src/test/java/com/mapbox/navigation/core/accounts/MapboxNavigationAccountsTest.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.Bundle
 import androidx.test.core.app.ApplicationProvider
 import com.mapbox.android.accounts.v1.AccountsConstants
+import com.mapbox.navigation.core.internal.accounts.MapboxNavigationAccounts
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
diff --git a/libnavigation-core/src/test/java/com/mapbox/navigation/core/accounts/NavigationAccountsSessionTest.kt b/libnavigation-core/src/test/java/com/mapbox/navigation/core/accounts/NavigationAccountsSessionTest.kt
index 9782b656a18..3dd4cc700e4 100644
--- a/libnavigation-core/src/test/java/com/mapbox/navigation/core/accounts/NavigationAccountsSessionTest.kt
+++ b/libnavigation-core/src/test/java/com/mapbox/navigation/core/accounts/NavigationAccountsSessionTest.kt
@@ -2,6 +2,7 @@ package com.mapbox.navigation.core.accounts
 
 import android.content.Context
 import com.mapbox.navigation.core.NavigationSession
+import com.mapbox.navigation.core.internal.accounts.MapboxNavigationAccounts
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkObject
diff --git a/libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxDistanceFormatterTest.kt b/libnavigation-core/src/test/java/com/mapbox/navigation/core/internal/MapboxDistanceFormatterTest.kt
similarity index 84%
rename from libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxDistanceFormatterTest.kt
rename to libnavigation-core/src/test/java/com/mapbox/navigation/core/internal/MapboxDistanceFormatterTest.kt
index d221113c295..54cc04736e2 100644
--- a/libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxDistanceFormatterTest.kt
+++ b/libnavigation-core/src/test/java/com/mapbox/navigation/core/internal/MapboxDistanceFormatterTest.kt
@@ -1,15 +1,15 @@
-package com.mapbox.navigation.core
+package com.mapbox.navigation.core.internal
 
 import android.content.Context
 import android.graphics.Typeface
 import android.text.style.RelativeSizeSpan
 import android.text.style.StyleSpan
 import androidx.test.core.app.ApplicationProvider
-import com.mapbox.navigation.base.typedef.IMPERIAL
-import com.mapbox.navigation.base.typedef.METRIC
-import com.mapbox.navigation.base.typedef.ROUNDING_INCREMENT_FIFTY
-import com.mapbox.navigation.base.typedef.ROUNDING_INCREMENT_FIVE
-import com.mapbox.navigation.base.typedef.UNDEFINED
+import com.mapbox.navigation.base.internal.VoiceUnit.IMPERIAL
+import com.mapbox.navigation.base.internal.VoiceUnit.METRIC
+import com.mapbox.navigation.base.internal.VoiceUnit.UNDEFINED
+import com.mapbox.navigation.core.Rounding.INCREMENT_FIFTY
+import com.mapbox.navigation.core.Rounding.INCREMENT_FIVE
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
@@ -37,7 +37,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceLargeDistanceImperialWithDefaultLocale() {
         val result = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(IMPERIAL)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
             .formatDistance(19312.1)
 
@@ -48,7 +48,7 @@ class MapboxDistanceFormatterTest {
     @Test
     fun formatDistanceLargeDistanceUnitTypeNull() {
         val result = MapboxDistanceFormatter.Builder(ctx)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
             .formatDistance(19312.1)
 
@@ -60,7 +60,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceLargeDistanceUnitTypeEmptyString() {
         val result = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType("")
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
             .formatDistance(19312.1)
 
@@ -72,7 +72,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceLargeDistanceMetric() {
         val result = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(METRIC)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
             .formatDistance(19312.1)
 
@@ -84,7 +84,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceSmallDistanceMetric() {
         val result = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(METRIC)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
             .formatDistance(10.0)
 
@@ -96,7 +96,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceSmallDistanceImperial() {
         val result = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(IMPERIAL)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
             .formatDistance(10.0)
 
@@ -108,7 +108,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceJapaneseLocale() {
         val result = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(IMPERIAL)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
             .formatDistance(10.0)
 
@@ -120,7 +120,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceMediumMetric() {
         val result = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(METRIC)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
             .formatDistance(1000.0)
 
@@ -132,7 +132,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceMediumMetricFractionalValue() {
         val result = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(METRIC)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
             .formatDistance(400.5)
 
@@ -144,7 +144,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceMediumImperial() {
         val result = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(IMPERIAL)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
             .formatDistance(1000.0)
 
@@ -190,7 +190,7 @@ class MapboxDistanceFormatterTest {
 
         val result = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(IMPERIAL)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
             .getSpannableDistanceString(input)
 
@@ -202,7 +202,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceImperialWithNonDefaultLocale() {
         val result = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(IMPERIAL)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .withLocale(Locale("hu"))
             .build()
             .formatDistance(19312.1)
@@ -225,7 +225,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceBelowZeroDistance() {
         val result = MapboxDistanceFormatter.Builder(ctx)
                 .withUnitType(IMPERIAL)
-                .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+                .withRoundingIncrement(INCREMENT_FIFTY)
                 .build()
                 .formatDistance(-0.1)
 
@@ -237,7 +237,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceBelowZeroDistanceRoundingIncrementFive() {
         val result = MapboxDistanceFormatter.Builder(ctx)
                 .withUnitType(IMPERIAL)
-                .withRoundingIncrement(ROUNDING_INCREMENT_FIVE)
+                .withRoundingIncrement(INCREMENT_FIVE)
                 .build()
                 .formatDistance(-0.1)
 
@@ -249,7 +249,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceUnitTypeUndefinedImperial() {
         val result = MapboxDistanceFormatter.Builder(ctx)
                 .withUnitType(UNDEFINED)
-                .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+                .withRoundingIncrement(INCREMENT_FIFTY)
                 .build()
                 .formatDistance(19312.1)
 
@@ -261,7 +261,7 @@ class MapboxDistanceFormatterTest {
     fun formatDistanceUnitTypeUndefinedMetric() {
         val result = MapboxDistanceFormatter.Builder(ctx)
                 .withUnitType(UNDEFINED)
-                .withRoundingIncrement(ROUNDING_INCREMENT_FIVE)
+                .withRoundingIncrement(INCREMENT_FIFTY)
                 .build()
                 .formatDistance(19312.1)
 
diff --git a/libnavigation-core/src/test/java/com/mapbox/navigation/core/trip/service/MapboxTripServiceTest.kt b/libnavigation-core/src/test/java/com/mapbox/navigation/core/internal/trip/service/MapboxTripServiceTest.kt
similarity index 98%
rename from libnavigation-core/src/test/java/com/mapbox/navigation/core/trip/service/MapboxTripServiceTest.kt
rename to libnavigation-core/src/test/java/com/mapbox/navigation/core/internal/trip/service/MapboxTripServiceTest.kt
index 66760b2150a..4a6284f960a 100644
--- a/libnavigation-core/src/test/java/com/mapbox/navigation/core/trip/service/MapboxTripServiceTest.kt
+++ b/libnavigation-core/src/test/java/com/mapbox/navigation/core/internal/trip/service/MapboxTripServiceTest.kt
@@ -1,4 +1,4 @@
-package com.mapbox.navigation.core.trip.service
+package com.mapbox.navigation.core.internal.trip.service
 
 import android.app.Notification
 import com.mapbox.base.common.logger.Logger
diff --git a/libnavigation-core/src/test/java/com/mapbox/navigation/core/trip/session/MapboxTripSessionTest.kt b/libnavigation-core/src/test/java/com/mapbox/navigation/core/internal/trip/session/MapboxTripSessionTest.kt
similarity index 97%
rename from libnavigation-core/src/test/java/com/mapbox/navigation/core/trip/session/MapboxTripSessionTest.kt
rename to libnavigation-core/src/test/java/com/mapbox/navigation/core/internal/trip/session/MapboxTripSessionTest.kt
index 2bc986a4fed..59f725dbf12 100644
--- a/libnavigation-core/src/test/java/com/mapbox/navigation/core/trip/session/MapboxTripSessionTest.kt
+++ b/libnavigation-core/src/test/java/com/mapbox/navigation/core/internal/trip/session/MapboxTripSessionTest.kt
@@ -1,4 +1,4 @@
-package com.mapbox.navigation.core.trip.session
+package com.mapbox.navigation.core.internal.trip.session
 
 import android.location.Location
 import android.os.Looper
@@ -11,9 +11,15 @@ import com.mapbox.api.directions.v5.models.BannerInstructions
 import com.mapbox.api.directions.v5.models.DirectionsRoute
 import com.mapbox.api.directions.v5.models.VoiceInstructions
 import com.mapbox.base.common.logger.Logger
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
-import com.mapbox.navigation.core.trip.service.TripService
+import com.mapbox.navigation.core.internal.trip.service.TripService
+import com.mapbox.navigation.core.trip.session.BannerInstructionsObserver
+import com.mapbox.navigation.core.trip.session.LocationObserver
+import com.mapbox.navigation.core.trip.session.OffRouteObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
+import com.mapbox.navigation.core.trip.session.TripSessionState
+import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
+import com.mapbox.navigation.core.trip.session.VoiceInstructionsObserver
 import com.mapbox.navigation.navigator.internal.MapboxNativeNavigator
 import com.mapbox.navigation.navigator.internal.TripStatus
 import com.mapbox.navigation.testing.MainCoroutineRule
diff --git a/libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxNavigationTelemetryTest.kt b/libnavigation-core/src/test/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetryTest.kt
similarity index 98%
rename from libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxNavigationTelemetryTest.kt
rename to libnavigation-core/src/test/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetryTest.kt
index c79a871458a..d48c58779b0 100644
--- a/libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxNavigationTelemetryTest.kt
+++ b/libnavigation-core/src/test/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetryTest.kt
@@ -1,4 +1,4 @@
-package com.mapbox.navigation.core
+package com.mapbox.navigation.core.telemetry
 
 import android.app.AlarmManager
 import android.content.Context
@@ -6,7 +6,7 @@ import android.content.SharedPreferences
 import com.mapbox.android.telemetry.MapboxTelemetryConstants
 import com.mapbox.api.directions.v5.models.DirectionsRoute
 import com.mapbox.navigation.base.options.NavigationOptions
-import com.mapbox.navigation.core.telemetry.MapboxNavigationTelemetry
+import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.metrics.MapboxMetricsReporter
 import com.mapbox.navigation.testing.MainCoroutineRule
 import com.mapbox.navigation.utils.internal.ThreadController
diff --git a/libnavigation-core/src/test/java/com/mapbox/navigation/core/SchemaTest.java b/libnavigation-core/src/test/java/com/mapbox/navigation/core/telemetry/events/SchemaTest.java
similarity index 95%
rename from libnavigation-core/src/test/java/com/mapbox/navigation/core/SchemaTest.java
rename to libnavigation-core/src/test/java/com/mapbox/navigation/core/telemetry/events/SchemaTest.java
index d731cadf666..b5a7917dd78 100644
--- a/libnavigation-core/src/test/java/com/mapbox/navigation/core/SchemaTest.java
+++ b/libnavigation-core/src/test/java/com/mapbox/navigation/core/telemetry/events/SchemaTest.java
@@ -1,13 +1,7 @@
-package com.mapbox.navigation.core;
+package com.mapbox.navigation.core.telemetry.events;
 
 import com.google.gson.*;
 import com.google.gson.annotations.SerializedName;
-import com.mapbox.navigation.core.telemetry.events.NavigationArriveEvent;
-import com.mapbox.navigation.core.telemetry.events.NavigationCancelEvent;
-import com.mapbox.navigation.core.telemetry.events.NavigationDepartEvent;
-import com.mapbox.navigation.core.telemetry.events.NavigationFeedbackEvent;
-import com.mapbox.navigation.core.telemetry.events.NavigationRerouteEvent;
-import com.mapbox.navigation.core.telemetry.events.NavigationStepData;
 import org.apache.commons.io.IOUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/MapOfflineManager.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/MapOfflineManager.java
index a957ce5b42a..79c17609dff 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/MapOfflineManager.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/MapOfflineManager.java
@@ -6,7 +6,7 @@
 import com.mapbox.mapboxsdk.offline.OfflineGeometryRegionDefinition;
 import com.mapbox.mapboxsdk.offline.OfflineManager;
 import com.mapbox.navigation.base.trip.model.RouteProgress;
-import com.mapbox.navigation.base.trip.RouteProgressObserver;
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationView.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationView.java
index 9652894d40e..5589f3ec710 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationView.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationView.java
@@ -35,10 +35,9 @@
 import com.mapbox.mapboxsdk.maps.Style;
 import com.mapbox.navigation.base.internal.extensions.ContextEx;
 import com.mapbox.navigation.base.formatter.DistanceFormatter;
-import com.mapbox.navigation.base.options.NavigationOptions;
 import com.mapbox.navigation.base.route.Router;
-import com.mapbox.navigation.base.typedef.TimeFormatType;
-import com.mapbox.navigation.core.MapboxDistanceFormatter;
+import com.mapbox.navigation.base.TimeFormat;
+import com.mapbox.navigation.core.internal.MapboxDistanceFormatter;
 import com.mapbox.navigation.core.MapboxNavigation;
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine;
 import com.mapbox.navigation.ui.camera.DynamicCamera;
@@ -743,7 +742,7 @@ private void establish(NavigationViewOptions options) {
   private void establishDistanceFormatter(final NavigationViewOptions options) {
     final String unitType = establishUnitType(options);
     final Locale language = getLocaleDirectionsRoute(options.directionsRoute(), getContext());
-    final int roundingIncrement = establishRoundingIncrement(options);
+    final int roundingIncrement = options.roundingIncrement();
     final DistanceFormatter distanceFormatter = MapboxDistanceFormatter.builder(getContext())
       .withRoundingIncrement(roundingIncrement)
       .withUnitType(unitType)
@@ -753,11 +752,6 @@ private void establishDistanceFormatter(final NavigationViewOptions options) {
     summaryBottomSheet.setDistanceFormatter(distanceFormatter);
   }
 
-  private int establishRoundingIncrement(NavigationViewOptions navigationViewOptions) {
-    NavigationOptions navigationOptions = navigationViewOptions.navigationOptions();
-    return navigationOptions.getRoundingIncrement();
-  }
-
   private String establishUnitType(NavigationViewOptions options) {
     RouteOptions routeOptions = options.directionsRoute().routeOptions();
     String voiceUnits = routeOptions == null ? null : routeOptions.voiceUnits();
@@ -765,7 +759,7 @@ private String establishUnitType(NavigationViewOptions options) {
   }
 
   private void establishTimeFormat(NavigationViewOptions options) {
-    @TimeFormatType
+    @TimeFormat.Type
     int timeFormatType = options.navigationOptions().getTimeFormatType();
     summaryBottomSheet.setTimeFormat(timeFormatType);
   }
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewEventDispatcher.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewEventDispatcher.java
index 204c38c787b..e0fb3be0d8d 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewEventDispatcher.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewEventDispatcher.java
@@ -11,7 +11,7 @@
 import com.mapbox.geojson.Point;
 import com.mapbox.navigation.core.MapboxNavigation;
 import com.mapbox.navigation.core.trip.session.LocationObserver;
-import com.mapbox.navigation.base.trip.RouteProgressObserver;
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver;
 import com.mapbox.navigation.ui.feedback.FeedbackItem;
 import com.mapbox.navigation.ui.listeners.BannerInstructionsListener;
 import com.mapbox.navigation.ui.listeners.FeedbackListener;
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewModel.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewModel.java
index 41c12ec6993..f76677c9158 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewModel.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewModel.java
@@ -24,8 +24,8 @@
 import com.mapbox.navigation.base.options.MapboxOnboardRouterConfig;
 import com.mapbox.navigation.base.options.NavigationOptions;
 import com.mapbox.navigation.base.trip.model.RouteProgress;
-import com.mapbox.navigation.base.typedef.TimeFormatType;
-import com.mapbox.navigation.core.MapboxDistanceFormatter;
+import com.mapbox.navigation.base.TimeFormat;
+import com.mapbox.navigation.core.internal.MapboxDistanceFormatter;
 import com.mapbox.navigation.core.MapboxNavigation;
 import com.mapbox.navigation.core.directions.session.RoutesObserver;
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine;
@@ -55,7 +55,7 @@
 
 import static com.mapbox.navigation.base.internal.extensions.LocaleEx.getLocaleDirectionsRoute;
 import static com.mapbox.navigation.base.internal.extensions.LocaleEx.getUnitTypeForLocale;
-import static com.mapbox.navigation.core.telemetry.events.FeedbackEvent.FEEDBACK_SOURCE_UI;
+import static com.mapbox.navigation.core.telemetry.events.FeedbackEvent.UI;
 
 public class NavigationViewModel extends AndroidViewModel {
 
@@ -89,7 +89,7 @@ public class NavigationViewModel extends AndroidViewModel {
   private RouteUtils routeUtils;
   private DistanceFormatter distanceFormatter;
   private String accessToken;
-  @TimeFormatType
+  @TimeFormat.Type
   private int timeFormatType;
   private boolean isRunning;
   private boolean isChangingConfigurations;
@@ -223,7 +223,7 @@ void initialize(NavigationViewOptions options) {
   void updateFeedbackScreenshot(String screenshot) {
     if (feedbackItem != null) {
       MapboxNavigation.postUserFeedback(feedbackItem.getFeedbackType(),
-        feedbackItem.getDescription(), FEEDBACK_SOURCE_UI, screenshot);
+        feedbackItem.getDescription(), UI, screenshot);
       sendEventFeedback(feedbackItem);
       isFeedbackSentSuccess.setValue(true);
       feedbackItem = null;
@@ -362,14 +362,9 @@ private void initializeTimeFormat(NavigationOptions options) {
     timeFormatType = options.getTimeFormatType();
   }
 
-  private int initializeRoundingIncrement(NavigationViewOptions options) {
-    NavigationOptions navigationOptions = options.navigationOptions();
-    return navigationOptions.getRoundingIncrement();
-  }
-
   private DistanceFormatter buildDistanceFormatter(final NavigationViewOptions options) {
     final String unitType = initializeUnitType(options);
-    final int roundingIncrement = initializeRoundingIncrement(options);
+    final int roundingIncrement = options.roundingIncrement();
     final Locale locale = getLocaleDirectionsRoute(options.directionsRoute(), getApplication());
     return new MapboxDistanceFormatter.Builder(getApplication())
             .withUnitType(unitType)
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewModelProgressObserver.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewModelProgressObserver.java
index c9dbaae34d6..790d1265280 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewModelProgressObserver.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewModelProgressObserver.java
@@ -4,7 +4,7 @@
 
 import com.mapbox.navigation.base.trip.model.RouteProgress;
 import com.mapbox.navigation.core.trip.session.LocationObserver;
-import com.mapbox.navigation.base.trip.RouteProgressObserver;
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewOptions.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewOptions.java
index 43887a68f5a..b768acbb74c 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewOptions.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/NavigationViewOptions.java
@@ -8,8 +8,9 @@
 import com.mapbox.api.directions.v5.models.DirectionsRoute;
 import com.mapbox.navigation.base.options.NavigationOptions;
 import com.mapbox.navigation.base.trip.model.RouteProgress;
+import com.mapbox.navigation.core.Rounding;
 import com.mapbox.navigation.core.trip.session.LocationObserver;
-import com.mapbox.navigation.base.trip.RouteProgressObserver;
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver;
 import com.mapbox.navigation.ui.camera.Camera;
 import com.mapbox.navigation.ui.listeners.BannerInstructionsListener;
 import com.mapbox.navigation.ui.listeners.FeedbackListener;
@@ -61,6 +62,8 @@ public abstract class NavigationViewOptions extends NavigationUiOptions {
   @Nullable
   public abstract Float maxMetersToTriggerDestinationArrival();
 
+  public abstract Integer roundingIncrement();
+
   @AutoValue.Builder
   public abstract static class Builder {
 
@@ -109,6 +112,13 @@ public abstract static class Builder {
      */
     public abstract Builder maxMetersToTriggerDestinationArrival(Float maxMetersToTriggerDestinationArrival);
 
+    /**
+     * Defines the increment displayed on the instruction view
+     * @param roundingIncrement displayed on the instruction view
+     * @return this builder
+     */
+    public abstract Builder roundingIncrement(@Rounding.Increment Integer roundingIncrement);
+
     /**
      * Add an offline path for loading offline routing data.
      * <p>
@@ -161,6 +171,7 @@ public abstract static class Builder {
   public static Builder builder() {
     return new AutoValue_NavigationViewOptions.Builder()
             .navigationOptions(new NavigationOptions.Builder().build())
+            .roundingIncrement(Rounding.INCREMENT_FIFTY)
             .shouldSimulateRoute(false)
             .waynameChipEnabled(true);
   }
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/camera/NavigationCamera.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/camera/NavigationCamera.java
index c98aae5507e..5295fa7726f 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/camera/NavigationCamera.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/camera/NavigationCamera.java
@@ -27,7 +27,7 @@
 import com.mapbox.navigation.base.trip.model.RouteProgress;
 import com.mapbox.navigation.core.MapboxNavigation;
 import com.mapbox.navigation.core.trip.session.LocationObserver;
-import com.mapbox.navigation.base.trip.RouteProgressObserver;
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/feedback/FeedbackBottomSheet.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/feedback/FeedbackBottomSheet.java
index f216e7d21ed..0623e5a849f 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/feedback/FeedbackBottomSheet.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/feedback/FeedbackBottomSheet.java
@@ -238,11 +238,11 @@ private List<FeedbackItem> buildGuidanceIssueList() {
 
     list.add(new FeedbackItem(getResources().getString(R.string.feedback_type_incorrect_visual),
       R.drawable.ic_feedback_incorrect_visual,
-      FeedbackEvent.FEEDBACK_TYPE_INCORRECT_VISUAL_GUIDANCE,
+      FeedbackEvent.INCORRECT_VISUAL_GUIDANCE,
       EMPTY_FEEDBACK_DESCRIPTION));
     list.add(new FeedbackItem(getResources().getString(R.string.feedback_type_confusing_audio),
       R.drawable.ic_feedback_confusing_audio,
-      FeedbackEvent.FEEDBACK_TYPE_INCORRECT_AUDIO_GUIDANCE,
+      FeedbackEvent.INCORRECT_AUDIO_GUIDANCE,
       EMPTY_FEEDBACK_DESCRIPTION));
 
     return list;
@@ -266,15 +266,15 @@ private List<FeedbackItem> buildNavigationIssueList() {
 
     list.add(new FeedbackItem(getResources().getString(R.string.feedback_type_route_quality),
       R.drawable.ic_feedback_route_quality,
-      FeedbackEvent.FEEDBACK_TYPE_ROUTING_ERROR,
+      FeedbackEvent.ROUTING_ERROR,
       EMPTY_FEEDBACK_DESCRIPTION));
     list.add(new FeedbackItem(getResources().getString(R.string.feedback_type_illegal_route),
       R.drawable.ic_feedback_illegal_route,
-      FeedbackEvent.FEEDBACK_TYPE_NOT_ALLOWED,
+      FeedbackEvent.NOT_ALLOWED,
       EMPTY_FEEDBACK_DESCRIPTION));
     list.add(new FeedbackItem(getResources().getString(R.string.feedback_type_road_closure),
       R.drawable.ic_feedback_road_closure,
-      FeedbackEvent.FEEDBACK_TYPE_ROAD_CLOSED,
+      FeedbackEvent.ROAD_CLOSED,
       EMPTY_FEEDBACK_DESCRIPTION));
 
     return list;
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/feedback/FeedbackItem.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/feedback/FeedbackItem.java
index 44a4a083329..a3672020723 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/feedback/FeedbackItem.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/feedback/FeedbackItem.java
@@ -4,7 +4,7 @@
 
 public class FeedbackItem {
 
-  @FeedbackEvent.FeedbackType
+  @FeedbackEvent.Type
   private String feedbackType;
   private String feedbackText;
   private String description;
@@ -12,7 +12,7 @@ public class FeedbackItem {
 
   FeedbackItem(String feedbackText,
       int feedbackImage,
-      @FeedbackEvent.FeedbackType
+      @FeedbackEvent.Type
           String feedbackType,
       String description) {
     this.feedbackText = feedbackText;
@@ -29,7 +29,7 @@ int getFeedbackImageId() {
     return feedbackImage;
   }
 
-  @FeedbackEvent.FeedbackType
+  @FeedbackEvent.Type
   public String getFeedbackType() {
     return feedbackType;
   }
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/InstructionView.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/InstructionView.java
index 68a27f2f5e1..006e02b5142 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/InstructionView.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/InstructionView.java
@@ -43,10 +43,11 @@
 import com.mapbox.navigation.base.formatter.DistanceFormatter;
 import com.mapbox.navigation.base.trip.model.RouteLegProgress;
 import com.mapbox.navigation.base.trip.model.RouteProgress;
-import com.mapbox.navigation.core.MapboxDistanceFormatter;
+import com.mapbox.navigation.core.internal.MapboxDistanceFormatter;
 import com.mapbox.navigation.core.MapboxNavigation;
+import com.mapbox.navigation.core.Rounding;
 import com.mapbox.navigation.core.trip.session.OffRouteObserver;
-import com.mapbox.navigation.base.trip.RouteProgressObserver;
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver;
 import com.mapbox.navigation.ui.FeedbackButton;
 import com.mapbox.navigation.ui.NavigationButton;
 import com.mapbox.navigation.ui.NavigationViewModel;
@@ -549,7 +550,7 @@ private void initAttributes(AttributeSet attributeSet) {
    */
   private void initialize() {
     final String unitType = getUnitTypeForLocale(ContextEx.inferDeviceLocale(getContext()));
-    final int roundingIncrement = NavigationConstants.ROUNDING_INCREMENT_FIFTY;
+    final int roundingIncrement = Rounding.INCREMENT_FIFTY;
     final Locale locale = ContextEx.inferDeviceLocale(getContext());
     distanceFormatter = new MapboxDistanceFormatter.Builder(getContext())
       .withUnitType(unitType)
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/maneuver/ManeuverView.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/maneuver/ManeuverView.java
index 5f7df098f5b..c4ebd10a53d 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/maneuver/ManeuverView.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/maneuver/ManeuverView.java
@@ -15,20 +15,17 @@
 import androidx.core.content.ContextCompat;
 import androidx.core.util.Pair;
 
+import com.mapbox.api.directions.v5.models.StepManeuver;
 import com.mapbox.libnavigation.ui.R;
 import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper;
 import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconDrawer;
+import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverModifier;
 import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuversStyleKit;
 
 import static com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper.DEFAULT_ROUNDABOUT_ANGLE;
 import static com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper.MANEUVER_TYPES_WITH_NULL_MODIFIERS;
 import static com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper.MANEUVER_ICON_DRAWER_MAP;
 import static com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper.ROUNDABOUT_MANEUVER_TYPES;
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.ManeuverModifier;
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.ManeuverType;
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT;
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT;
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.STEP_MANEUVER_TYPE_ARRIVE;
 
 
 /**
@@ -38,9 +35,9 @@
  */
 public class ManeuverView extends View {
 
-  @ManeuverType
+  @StepManeuver.StepManeuverType
   private String maneuverType = null;
-  @ManeuverModifier
+  @ManeuverModifier.Type
   private String maneuverModifier = null;
   @ColorInt
   private int primaryColor;
@@ -49,7 +46,7 @@ public class ManeuverView extends View {
   private float roundaboutAngle = DEFAULT_ROUNDABOUT_ANGLE;
   private Pair<String, String> maneuverTypeAndModifier = new Pair<>(null, null);
   private PointF size;
-  private String drivingSide = STEP_MANEUVER_MODIFIER_RIGHT;
+  private String drivingSide = ManeuverModifier.RIGHT;
 
   /**
    * A custom view that can be used with the Mapbox Directions API.
@@ -131,7 +128,7 @@ public void setRoundaboutAngle(@FloatRange(from = 60f, to = 300f) float roundabo
   }
 
   public void setDrivingSide(String drivingSide) {
-    if (STEP_MANEUVER_MODIFIER_LEFT.equals(drivingSide) || STEP_MANEUVER_MODIFIER_RIGHT.equals(drivingSide)) {
+    if (ManeuverModifier.LEFT.equals(drivingSide) || ManeuverModifier.RIGHT.equals(drivingSide)) {
       updateDrivingSide(drivingSide);
       invalidate();
     }
@@ -228,7 +225,7 @@ private boolean checkManeuverTypeWithNullModifier(String maneuverType) {
 
   @Nullable
   private String checkManeuverModifier(String maneuverType, String maneuverModifier) {
-    if (!maneuverType.contentEquals(STEP_MANEUVER_TYPE_ARRIVE) && maneuverModifier != null) {
+    if (!maneuverType.contentEquals(StepManeuver.ARRIVE) && maneuverModifier != null) {
       maneuverType = null;
     }
     return maneuverType;
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/turnlane/TurnLaneViewData.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/turnlane/TurnLaneViewData.java
index 82b75d5f714..b066cebbae5 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/turnlane/TurnLaneViewData.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/turnlane/TurnLaneViewData.java
@@ -1,13 +1,6 @@
 package com.mapbox.navigation.ui.instruction.turnlane;
 
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT;
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT;
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.TURN_LANE_INDICATION_LEFT;
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.TURN_LANE_INDICATION_RIGHT;
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.TURN_LANE_INDICATION_SLIGHT_LEFT;
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.TURN_LANE_INDICATION_SLIGHT_RIGHT;
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.TURN_LANE_INDICATION_STRAIGHT;
-import static com.mapbox.navigation.ui.legacy.NavigationConstants.TURN_LANE_INDICATION_UTURN;
+import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverModifier;
 
 class TurnLaneViewData {
 
@@ -36,51 +29,51 @@ String getDrawMethod() {
   private void buildDrawData(String laneIndications, String maneuverModifier) {
 
     // U-turn
-    if (laneIndications.contentEquals(TURN_LANE_INDICATION_UTURN)) {
+    if (laneIndications.contentEquals(ManeuverModifier.UTURN)) {
       drawMethod = DRAW_LANE_UTURN;
       shouldFlip = true;
       return;
     }
 
     // Straight
-    if (laneIndications.contentEquals(TURN_LANE_INDICATION_STRAIGHT)) {
+    if (laneIndications.contentEquals(ManeuverModifier.STRAIGHT)) {
       drawMethod = DRAW_LANE_STRAIGHT;
       return;
     }
 
     // Right or left
-    if (laneIndications.contentEquals(TURN_LANE_INDICATION_RIGHT)) {
+    if (laneIndications.contentEquals(ManeuverModifier.RIGHT)) {
       drawMethod = DRAW_LANE_RIGHT;
       return;
-    } else if (laneIndications.contentEquals(TURN_LANE_INDICATION_LEFT)) {
+    } else if (laneIndications.contentEquals(ManeuverModifier.LEFT)) {
       drawMethod = DRAW_LANE_RIGHT;
       shouldFlip = true;
       return;
     }
 
     // Slight right or slight left
-    if (laneIndications.contentEquals(TURN_LANE_INDICATION_SLIGHT_RIGHT)) {
+    if (laneIndications.contentEquals(ManeuverModifier.SLIGHT_RIGHT)) {
       drawMethod = DRAW_LANE_SLIGHT_RIGHT;
       return;
-    } else if (laneIndications.contentEquals(TURN_LANE_INDICATION_SLIGHT_LEFT)) {
+    } else if (laneIndications.contentEquals(ManeuverModifier.SLIGHT_LEFT)) {
       drawMethod = DRAW_LANE_SLIGHT_RIGHT;
       shouldFlip = true;
       return;
     }
 
     // Straight and right or left
-    if (isStraightPlusIndication(laneIndications, TURN_LANE_INDICATION_RIGHT)) {
+    if (isStraightPlusIndication(laneIndications, ManeuverModifier.RIGHT)) {
       setDrawMethodWithModifier(maneuverModifier);
-    } else if (isStraightPlusIndication(laneIndications, TURN_LANE_INDICATION_LEFT)) {
+    } else if (isStraightPlusIndication(laneIndications, ManeuverModifier.LEFT)) {
       setDrawMethodWithModifier(maneuverModifier);
       shouldFlip = true;
     }
   }
 
   private void setDrawMethodWithModifier(String maneuverModifier) {
-    if (maneuverModifier.contains(STEP_MANEUVER_MODIFIER_RIGHT)) {
+    if (maneuverModifier.contains(ManeuverModifier.RIGHT)) {
       drawMethod = DRAW_LANE_RIGHT_ONLY;
-    } else if (maneuverModifier.contains(STEP_MANEUVER_MODIFIER_STRAIGHT)) {
+    } else if (maneuverModifier.contains(ManeuverModifier.STRAIGHT)) {
       drawMethod = DRAW_LANE_STRAIGHT_ONLY;
     } else {
       drawMethod = DRAW_LANE_RIGHT_ONLY;
@@ -88,7 +81,7 @@ private void setDrawMethodWithModifier(String maneuverModifier) {
   }
 
   private boolean isStraightPlusIndication(String laneIndications, String turnLaneIndication) {
-    return laneIndications.contains(TURN_LANE_INDICATION_STRAIGHT)
+    return laneIndications.contains(ManeuverModifier.STRAIGHT)
       && laneIndications.contains(turnLaneIndication);
   }
 }
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/legacy/NavigationConstants.kt b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/legacy/NavigationConstants.kt
index 36e2777d538..2bd81da4d81 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/legacy/NavigationConstants.kt
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/legacy/NavigationConstants.kt
@@ -1,8 +1,5 @@
 package com.mapbox.navigation.ui.legacy
 
-import androidx.annotation.IntDef
-import androidx.annotation.StringDef
-
 /**
  * Navigation constants
  *
@@ -10,41 +7,6 @@ import androidx.annotation.StringDef
  */
 object NavigationConstants {
 
-    /**
-     * If default voice instructions are enabled, this identifier will be used to differentiate them
-     * from custom milestones in the
-     * [com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener].
-     *
-     * @since 0.7.0
-     */
-    const val VOICE_INSTRUCTION_MILESTONE_ID = 1
-
-    /**
-     * String channel used to post the navigation notification (custom or default).
-     *
-     *
-     * If &gt; Android O, a notification channel needs to be created to properly post the notification.
-     *
-     * @since 0.8.0
-     */
-    const val NAVIGATION_NOTIFICATION_CHANNEL = "NAVIGATION_NOTIFICATION_CHANNEL"
-
-    /**
-     * This identifier will be used to
-     * differentiate the [com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone]
-     * from custom milestones in the [com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener].
-     *
-     * @since 0.8.0
-     */
-    const val BANNER_INSTRUCTION_MILESTONE_ID = 2
-
-    /**
-     * Random integer value used for identifying the navigation notification.
-     *
-     * @since 0.5.0
-     */
-    const val NAVIGATION_NOTIFICATION_ID = 5678
-
     /**
      * Duration in which the AlertView is shown with the "Report Problem" text.
      */
@@ -75,15 +37,6 @@ object NavigationConstants {
      */
     const val NAVIGATION_VIEW_INITIAL_MAP_POSITION = "navigation_view_initial_map_position"
 
-    /**
-     * In seconds, how quickly [com.mapbox.services.android.navigation.v5.route.FasterRouteDetector]
-     * will tell [RouteProcessorBackgroundThread] to check
-     * for a faster [com.mapbox.api.directions.v5.models.DirectionsRoute].
-     *
-     * @since 0.9.0
-     */
-    const val NAVIGATION_CHECK_FASTER_ROUTE_INTERVAL = 120
-
     /**
      * 125 seconds remaining is considered a low alert level when
      * navigating along a [com.mapbox.api.directions.v5.models.LegStep].
@@ -108,36 +61,6 @@ object NavigationConstants {
      */
     const val NAVIGATION_HIGH_ALERT_DURATION = 15
 
-    /**
-     * Default approximate location engine interval lag in milliseconds
-     *
-     *
-     * This value will be used to offset the time at which the current location was calculated
-     * in such a way as to project the location forward along the current trajectory so as to
-     * appear more in sync with the users ground-truth location
-     *
-     * @since 0.20.0
-     */
-    internal const val NAVIGATION_LOCATION_ENGINE_INTERVAL_LAG = 1500
-
-    /**
-     * Default off route threshold in meters
-     */
-    internal const val NAVIGATION_OFF_ROUTE_THRESHOLD = 50.0f
-
-    /**
-     * Default off route threshold in meters when near an intersection which is more prone
-     * to inaccurate gps fixes
-     */
-    internal const val NAVIGATION_OFF_ROUTE_THRESHOLD_WHEN_NEAR_INTERSECTION = 25.0f
-
-    /**
-     * Default radius in meters for off route detection near intersection
-     */
-    internal const val NAVIGATION_INTERSECTION_RADIUS_FOR_OFF_ROUTE_DETECTION = 40.0f
-
-    internal const val ROUTE_REFRESH_INTERVAL = 5 * 60 * 1000L
-
     /**
      * Maximum duration of the zoom/tilt adjustment animation while tracking.
      */
@@ -187,229 +110,4 @@ object NavigationConstants {
      * Bundle key to store map style URL
      */
     const val MAP_STYLE_URL_KEY = "offline_map_style_url_key"
-
-    /**
-     * Indicates "turn" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_TURN = "turn"
-
-    /**
-     * Indicates "new name" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_NEW_NAME = "new name"
-
-    /**
-     * Indicates "depart" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_DEPART = "depart"
-
-    /**
-     * Indicates "arrive" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_ARRIVE = "arrive"
-
-    /**
-     * Indicates "merge" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_MERGE = "merge"
-
-    /**
-     * Indicates "on ramp" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_ON_RAMP = "on ramp"
-
-    /**
-     * Indicates "off ramp" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_OFF_RAMP = "off ramp"
-
-    /**
-     * Indicates "fork" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_FORK = "fork"
-
-    /**
-     * Indicates "end of road" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_END_OF_ROAD = "end of road"
-
-    /**
-     * Indicates "continue" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_CONTINUE = "continue"
-
-    /**
-     * Indicates "roundabout" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_ROUNDABOUT = "roundabout"
-
-    /**
-     * Indicates "rotary" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_ROTARY = "rotary"
-
-    /**
-     * Indicates "roundabout turn" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_ROUNDABOUT_TURN = "roundabout turn"
-
-    /**
-     * Indicates "notification" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_NOTIFICATION = "notification"
-
-    /**
-     * Indicates "exit roundabout" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_EXIT_ROUNDABOUT = "exit roundabout"
-
-    /**
-     * Indicates "exit rotary" maneuver type to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_TYPE_EXIT_ROTARY = "exit rotary"
-
-    /**
-     * Indicates "uturn" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_MODIFIER_UTURN = "uturn"
-
-    /**
-     * Indicates "sharp right" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_MODIFIER_SHARP_RIGHT = "sharp right"
-
-    /**
-     * Indicates "right" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_MODIFIER_RIGHT = "right"
-
-    /**
-     * Indicates "slight right" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT = "slight right"
-
-    /**
-     * Indicates "straight" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_MODIFIER_STRAIGHT = "straight"
-
-    /**
-     * Indicates "slight left" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_MODIFIER_SLIGHT_LEFT = "slight left"
-
-    /**
-     * Indicates "left" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_MODIFIER_LEFT = "left"
-
-    /**
-     * Indicates "sharp left" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
-     */
-    const val STEP_MANEUVER_MODIFIER_SHARP_LEFT = "sharp left"
-
-    /**
-     * Indication to turn left
-     */
-    const val TURN_LANE_INDICATION_LEFT = "left"
-
-    /**
-     * Indication to turn slight left
-     */
-    const val TURN_LANE_INDICATION_SLIGHT_LEFT = "slight left"
-
-    /**
-     * Indication to go straight
-     */
-    const val TURN_LANE_INDICATION_STRAIGHT = "straight"
-
-    /**
-     * Indication to turn right
-     */
-    const val TURN_LANE_INDICATION_RIGHT = "right"
-
-    /**
-     * Indication to turn slight right
-     */
-    const val TURN_LANE_INDICATION_SLIGHT_RIGHT = "slight right"
-
-    /**
-     * Indication to take a u-turn
-     */
-    const val TURN_LANE_INDICATION_UTURN = "uturn"
-
-    /**
-     * Round small distances in increments of 5
-     */
-    const val ROUNDING_INCREMENT_FIVE = 5
-
-    /**
-     * Round small distances in increments of 10
-     */
-    const val ROUNDING_INCREMENT_TEN = 10
-
-    /**
-     * Round small distances in increments of 25
-     */
-    const val ROUNDING_INCREMENT_TWENTY_FIVE = 25
-
-    /**
-     * Round small distances in increments of 50
-     */
-    const val ROUNDING_INCREMENT_FIFTY = 50
-
-    /**
-     * Round small distances in increments of 100
-     */
-    const val ROUNDING_INCREMENT_ONE_HUNDRED = 100
-
-    /**
-     * Representation of ManeuverType in form of logical types
-     */
-    @StringDef(
-        STEP_MANEUVER_TYPE_TURN,
-        STEP_MANEUVER_TYPE_NEW_NAME,
-        STEP_MANEUVER_TYPE_DEPART,
-        STEP_MANEUVER_TYPE_ARRIVE,
-        STEP_MANEUVER_TYPE_MERGE,
-        STEP_MANEUVER_TYPE_ON_RAMP,
-        STEP_MANEUVER_TYPE_OFF_RAMP,
-        STEP_MANEUVER_TYPE_FORK,
-        STEP_MANEUVER_TYPE_END_OF_ROAD,
-        STEP_MANEUVER_TYPE_CONTINUE,
-        STEP_MANEUVER_TYPE_ROUNDABOUT,
-        STEP_MANEUVER_TYPE_ROTARY,
-        STEP_MANEUVER_TYPE_ROUNDABOUT_TURN,
-        STEP_MANEUVER_TYPE_NOTIFICATION,
-        STEP_MANEUVER_TYPE_EXIT_ROUNDABOUT,
-        STEP_MANEUVER_TYPE_EXIT_ROTARY
-    )
-    annotation class ManeuverType
-
-    /**
-     * Representation of ManeuverModifier in form of logical types
-     */
-    @StringDef(
-        STEP_MANEUVER_MODIFIER_UTURN,
-        STEP_MANEUVER_MODIFIER_SHARP_RIGHT,
-        STEP_MANEUVER_MODIFIER_RIGHT,
-        STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT,
-        STEP_MANEUVER_MODIFIER_STRAIGHT,
-        STEP_MANEUVER_MODIFIER_SLIGHT_LEFT,
-        STEP_MANEUVER_MODIFIER_LEFT,
-        STEP_MANEUVER_MODIFIER_SHARP_LEFT
-    )
-    annotation class ManeuverModifier
-
-    /**
-     * Rounding increments for use in [com.mapbox.navigation.core.MapboxDistanceFormatter].
-     */
-    @IntDef(
-        ROUNDING_INCREMENT_FIVE,
-        ROUNDING_INCREMENT_TEN,
-        ROUNDING_INCREMENT_TWENTY_FIVE,
-        ROUNDING_INCREMENT_FIFTY,
-        ROUNDING_INCREMENT_ONE_HUNDRED
-    )
-    annotation class RoundingIncrement
 }
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/FpsDelegateProgressChangeListener.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/FpsDelegateProgressChangeListener.java
index 28d9d9a8b4b..a60facec5ee 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/FpsDelegateProgressChangeListener.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/FpsDelegateProgressChangeListener.java
@@ -1,7 +1,7 @@
 package com.mapbox.navigation.ui.map;
 
 import com.mapbox.navigation.base.trip.model.RouteProgress;
-import com.mapbox.navigation.base.trip.RouteProgressObserver;
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/MapFpsDelegate.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/MapFpsDelegate.java
index c9fc5aba3e1..a142c622311 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/MapFpsDelegate.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/MapFpsDelegate.java
@@ -3,11 +3,11 @@
 import android.content.Context;
 
 import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.navigation.ui.legacy.NavigationConstants;
+import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverModifier;
 import com.mapbox.navigation.base.trip.model.RouteLegProgress;
 import com.mapbox.navigation.base.trip.model.RouteProgress;
 import com.mapbox.navigation.core.MapboxNavigation;
-import com.mapbox.navigation.base.trip.RouteProgressObserver;
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver;
 import com.mapbox.navigation.ui.camera.NavigationCamera;
 import com.mapbox.navigation.ui.camera.OnTrackingModeChangedListener;
 import com.mapbox.navigation.ui.camera.OnTrackingModeTransitionListener;
@@ -115,9 +115,9 @@ private boolean validLowFpsManeuver(RouteLegProgress routeLegProgress) {
         && routeLegProgress.currentStepProgress().step() != null) {
       final String maneuverModifier = routeLegProgress.currentStepProgress().step().maneuver().modifier();
       return maneuverModifier != null
-          && (maneuverModifier.equals(NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT)
-          || maneuverModifier.equals(NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT)
-          || maneuverModifier.equals(NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT));
+          && (maneuverModifier.equals(ManeuverModifier.STRAIGHT)
+          || maneuverModifier.equals(ManeuverModifier.SLIGHT_LEFT)
+          || maneuverModifier.equals(ManeuverModifier.SLIGHT_RIGHT));
     }
     return false;
   }
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/MapWayNameChangeObserver.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/MapWayNameChangeObserver.java
index 5acdbbed75a..87e59ec07bc 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/MapWayNameChangeObserver.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/MapWayNameChangeObserver.java
@@ -4,7 +4,7 @@
 
 import com.mapbox.navigation.base.trip.model.RouteProgress;
 import com.mapbox.navigation.core.trip.session.LocationObserver;
-import com.mapbox.navigation.base.trip.RouteProgressObserver;
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/puck/NavigationPuckPresenter.kt b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/puck/NavigationPuckPresenter.kt
index ed1c776f352..46873c56c4a 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/puck/NavigationPuckPresenter.kt
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/puck/NavigationPuckPresenter.kt
@@ -6,9 +6,9 @@ import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import com.mapbox.mapboxsdk.location.LocationComponentOptions
 import com.mapbox.mapboxsdk.maps.MapboxMap
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 
 /**
  * It listens for routeProgress events and applies the drawable returned by the puckDrawableSupplier
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/route/MapRouteProgressChangeListener.kt b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/route/MapRouteProgressChangeListener.kt
index 87a265964d9..cc80117b12f 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/route/MapRouteProgressChangeListener.kt
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/route/MapRouteProgressChangeListener.kt
@@ -2,8 +2,8 @@ package com.mapbox.navigation.ui.route
 
 import com.mapbox.api.directions.v5.models.DirectionsRoute
 import com.mapbox.geojson.LineString
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.ui.route.MapRouteLine.MapRouteLineSupport.buildRouteLineExpression
 import com.mapbox.navigation.utils.internal.ThreadController
 import kotlinx.coroutines.Dispatchers
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/summary/SummaryBottomSheet.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/summary/SummaryBottomSheet.java
index 0ff923d2e7e..44d540a5999 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/summary/SummaryBottomSheet.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/summary/SummaryBottomSheet.java
@@ -29,10 +29,10 @@
 import com.mapbox.navigation.base.internal.extensions.ContextEx;
 import com.mapbox.navigation.base.formatter.DistanceFormatter;
 import com.mapbox.navigation.base.trip.model.RouteProgress;
-import com.mapbox.navigation.base.typedef.RoundingIncrementKt;
-import com.mapbox.navigation.base.typedef.TimeFormatType;
-import com.mapbox.navigation.core.MapboxDistanceFormatter;
-import com.mapbox.navigation.base.trip.RouteProgressObserver;
+import com.mapbox.navigation.base.TimeFormat;
+import com.mapbox.navigation.core.internal.MapboxDistanceFormatter;
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver;
+import com.mapbox.navigation.core.Rounding;
 import com.mapbox.navigation.ui.NavigationViewModel;
 import com.mapbox.navigation.ui.utils.ViewUtils;
 
@@ -40,7 +40,7 @@
 import java.util.Locale;
 
 import static com.mapbox.navigation.base.internal.extensions.LocaleEx.getUnitTypeForLocale;
-import static com.mapbox.navigation.base.typedef.TimeFormatTypeKt.NONE_SPECIFIED;
+import static com.mapbox.navigation.base.TimeFormat.NONE_SPECIFIED;
 
 /**
  * A view with {@link com.google.android.material.bottomsheet.BottomSheetBehavior}
@@ -69,7 +69,7 @@ public class SummaryBottomSheet extends FrameLayout implements LifecycleObserver
 
   private boolean isRerouting;
   @SuppressLint("WrongConstant")
-  @TimeFormatType
+  @TimeFormat.Type
   private int timeFormatType = NONE_SPECIFIED;
   private DistanceFormatter distanceFormatter;
   private NavigationViewModel navigationViewModel;
@@ -199,7 +199,7 @@ public void hideRerouteState() {
    * @param type to use
    */
   @SuppressLint("WrongConstant")
-  public void setTimeFormat(@TimeFormatType int type) {
+  public void setTimeFormat(@TimeFormat.Type int type) {
     this.timeFormatType = type;
   }
 
@@ -250,7 +250,7 @@ private void initializeDistanceFormatter() {
     final String unitType = getUnitTypeForLocale(locale);
     distanceFormatter = new MapboxDistanceFormatter.Builder(getContext())
             .withUnitType(unitType)
-            .withRoundingIncrement(RoundingIncrementKt.ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(Rounding.INCREMENT_FIFTY)
             .withLocale(locale)
             .build();
   }
diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/summary/SummaryModel.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/summary/SummaryModel.java
index 76f15ce9fb1..8f351024d91 100644
--- a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/summary/SummaryModel.java
+++ b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/summary/SummaryModel.java
@@ -7,7 +7,7 @@
 import com.mapbox.navigation.base.internal.extensions.LocaleEx;
 import com.mapbox.navigation.base.formatter.DistanceFormatter;
 import com.mapbox.navigation.base.trip.model.RouteProgress;
-import com.mapbox.navigation.base.typedef.TimeFormatType;
+import com.mapbox.navigation.base.TimeFormat;
 import com.mapbox.navigation.trip.notification.internal.TimeFormatter;
 
 import java.util.Calendar;
@@ -20,7 +20,7 @@ public class SummaryModel {
   private final String arrivalTime;
 
   public SummaryModel(final Context context, final DistanceFormatter distanceFormatter, final RouteProgress progress,
-                      final @TimeFormatType int timeFormatType) {
+                      final @TimeFormat.Type int timeFormatType) {
     final Locale locale = progress.route() == null ? null :
             LocaleEx.getLocaleDirectionsRoute(progress.route(), context);
     distanceRemaining = distanceFormatter.formatDistance(progress.distanceRemaining()).toString();
diff --git a/libnavigation-ui/src/test/java/com/mapbox/navigation/ui/camera/NavigationCameraTest.java b/libnavigation-ui/src/test/java/com/mapbox/navigation/ui/camera/NavigationCameraTest.java
index 1dcf8f17281..2bffc8413d9 100644
--- a/libnavigation-ui/src/test/java/com/mapbox/navigation/ui/camera/NavigationCameraTest.java
+++ b/libnavigation-ui/src/test/java/com/mapbox/navigation/ui/camera/NavigationCameraTest.java
@@ -7,7 +7,7 @@
 import com.mapbox.mapboxsdk.location.modes.CameraMode;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.navigation.core.MapboxNavigation;
-import com.mapbox.navigation.base.trip.RouteProgressObserver;
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver;
 import com.mapbox.navigation.ui.BaseTest;
 
 import org.junit.Test;
diff --git a/libnavigation-ui/src/test/java/com/mapbox/navigation/ui/puck/NavigationPuckPresenterTest.kt b/libnavigation-ui/src/test/java/com/mapbox/navigation/ui/puck/NavigationPuckPresenterTest.kt
index c68d0a8dfc6..2504215034b 100644
--- a/libnavigation-ui/src/test/java/com/mapbox/navigation/ui/puck/NavigationPuckPresenterTest.kt
+++ b/libnavigation-ui/src/test/java/com/mapbox/navigation/ui/puck/NavigationPuckPresenterTest.kt
@@ -5,10 +5,10 @@ import com.mapbox.mapboxsdk.camera.CameraPosition
 import com.mapbox.mapboxsdk.location.LocationComponent
 import com.mapbox.mapboxsdk.location.LocationComponentOptions
 import com.mapbox.mapboxsdk.maps.MapboxMap
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.base.trip.model.RouteProgressState
 import com.mapbox.navigation.core.MapboxNavigation
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.slot
diff --git a/libnavigation-ui/src/test/java/com/mapbox/navigation/ui/summary/SummaryModelTest.kt b/libnavigation-ui/src/test/java/com/mapbox/navigation/ui/summary/SummaryModelTest.kt
index c49f96bd5a9..24d392e3284 100644
--- a/libnavigation-ui/src/test/java/com/mapbox/navigation/ui/summary/SummaryModelTest.kt
+++ b/libnavigation-ui/src/test/java/com/mapbox/navigation/ui/summary/SummaryModelTest.kt
@@ -2,11 +2,11 @@ package com.mapbox.navigation.ui.summary
 
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
+import com.mapbox.navigation.base.TimeFormat.TWELVE_HOURS
+import com.mapbox.navigation.base.internal.VoiceUnit.METRIC
 import com.mapbox.navigation.base.trip.model.RouteProgress
-import com.mapbox.navigation.base.typedef.METRIC
-import com.mapbox.navigation.base.typedef.ROUNDING_INCREMENT_FIFTY
-import com.mapbox.navigation.base.typedef.TWELVE_HOURS
-import com.mapbox.navigation.core.MapboxDistanceFormatter
+import com.mapbox.navigation.core.Rounding.INCREMENT_FIFTY
+import com.mapbox.navigation.core.internal.MapboxDistanceFormatter
 import com.mapbox.navigation.trip.notification.internal.TimeFormatter.formatTime
 import com.mapbox.navigation.ui.BaseTest
 import java.util.Calendar
@@ -33,7 +33,7 @@ class SummaryModelTest : BaseTest() {
         val routeProgress = buildRouteProgress()
         val distanceFormatter = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(METRIC)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
 
         val result = SummaryModel(
@@ -50,7 +50,7 @@ class SummaryModelTest : BaseTest() {
         val routeProgress = buildRouteProgress()
         val distanceFormatter = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(METRIC)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
 
         val result = SummaryModel(
@@ -67,7 +67,7 @@ class SummaryModelTest : BaseTest() {
         val routeProgress = buildRouteProgress()
         val distanceFormatter = MapboxDistanceFormatter.Builder(ctx)
             .withUnitType(METRIC)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(INCREMENT_FIFTY)
             .build()
         val time = Calendar.getInstance()
         val legDurationRemaining: Double = routeProgress!!
diff --git a/libnavigation-util/build.gradle b/libnavigation-util/build.gradle
index fba6b424edf..71aada6fffd 100644
--- a/libnavigation-util/build.gradle
+++ b/libnavigation-util/build.gradle
@@ -9,9 +9,10 @@ dokka {
     outputFormat = 'javadoc'
     configuration {
         moduleName = 'libnavigation-utils'
+        reportUndocumented = true
 
         perPackageOption {
-            prefix = "utils"
+            prefix = "com.mapbox.navigation.utils.internal"
             suppress = true
         }
     }
diff --git a/libnavigation-util/src/test/java/com/mapbox/navigation/utils/internal/ThreadControllerKtTest.kt b/libnavigation-util/src/test/java/com/mapbox/navigation/utils/internal/ThreadControllerTest.kt
similarity index 65%
rename from libnavigation-util/src/test/java/com/mapbox/navigation/utils/internal/ThreadControllerKtTest.kt
rename to libnavigation-util/src/test/java/com/mapbox/navigation/utils/internal/ThreadControllerTest.kt
index 89d70dd9718..cbbc95df681 100644
--- a/libnavigation-util/src/test/java/com/mapbox/navigation/utils/internal/ThreadControllerKtTest.kt
+++ b/libnavigation-util/src/test/java/com/mapbox/navigation/utils/internal/ThreadControllerTest.kt
@@ -1,15 +1,37 @@
 package com.mapbox.navigation.utils.internal
 
+import com.mapbox.navigation.testing.MainCoroutineRule
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.`is`
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertThat
 import org.junit.Assert.assertTrue
+import org.junit.Rule
 import org.junit.Test
 
-class ThreadControllerKtTest {
+class ThreadControllerTest {
+
+    @get:Rule
+    val coroutineRule = MainCoroutineRule()
+
+    @Test
+    fun jobCountValidationNonUIScope() = coroutineRule.runBlockingTest {
+        val maxCoroutines = 10
+        val maxDelay = 100L
+        val jobControl = ThreadController.getIOScopeAndRootJob()
+        (0 until maxCoroutines).forEach {
+            jobControl.scope.launch {
+                delay(maxDelay)
+            }
+        }
+        assertTrue(jobControl.job.children.count() == maxCoroutines)
+        jobControl.job.cancel()
+        assertTrue(jobControl.job.isCancelled)
+    }
 
     @Test
     fun monitorChannelWithException_callsOnCancellation_whenChannelClosed() {
diff --git a/libnavigator/build.gradle b/libnavigator/build.gradle
index ac00f913efe..3b4c84446b5 100644
--- a/libnavigator/build.gradle
+++ b/libnavigator/build.gradle
@@ -10,6 +10,11 @@ dokka {
     configuration {
         moduleName = 'libnavigator'
         reportUndocumented = true
+
+        perPackageOption {
+            prefix = "com.mapbox.navigation.navigator.internal"
+            suppress = true
+        }
     }
 }
 
diff --git a/libtrip-notification/build.gradle b/libtrip-notification/build.gradle
index ba2bd409c7a..1d19f38265a 100644
--- a/libtrip-notification/build.gradle
+++ b/libtrip-notification/build.gradle
@@ -11,6 +11,11 @@ dokka {
     configuration {
         moduleName = 'libtrip-notification'
         reportUndocumented = true
+
+        perPackageOption {
+            prefix = "com.mapbox.navigation.trip.notification.internal"
+            suppress = true
+        }
     }
 }
 
diff --git a/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/MapboxTripNotification.kt b/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/MapboxTripNotification.kt
index 4aa20fb3664..2d4a6a56aca 100644
--- a/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/MapboxTripNotification.kt
+++ b/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/MapboxTripNotification.kt
@@ -26,6 +26,7 @@ import com.mapbox.annotation.module.MapboxModule
 import com.mapbox.annotation.module.MapboxModuleType
 import com.mapbox.api.directions.v5.models.BannerInstructions
 import com.mapbox.api.directions.v5.models.BannerText
+import com.mapbox.api.directions.v5.models.StepManeuver
 import com.mapbox.api.directions.v5.models.StepManeuver.StepManeuverType
 import com.mapbox.navigation.base.formatter.DistanceFormatter
 import com.mapbox.navigation.base.options.NavigationOptions
@@ -39,8 +40,7 @@ import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHel
 import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper.ROUNDABOUT_MANEUVER_TYPES
 import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper.adjustRoundaboutAngle
 import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper.isManeuverIconNeedFlip
-import com.mapbox.navigation.trip.notification.internal.maneuver.STEP_MANEUVER_MODIFIER_RIGHT
-import com.mapbox.navigation.trip.notification.internal.maneuver.STEP_MANEUVER_TYPE_ARRIVE
+import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverModifier
 import com.mapbox.navigation.utils.internal.END_NAVIGATION_ACTION
 import com.mapbox.navigation.utils.internal.NAVIGATION_NOTIFICATION_CHANNEL
 import com.mapbox.navigation.utils.internal.NOTIFICATION_CHANNEL
@@ -303,7 +303,7 @@ class MapboxTripNotification constructor(
                 if (isManeuverStateChanged(bannerInstructions)) {
                     updateManeuverImage(
                         routeProgress.currentLegProgress()?.currentStepProgress()?.step()?.drivingSide()
-                            ?: STEP_MANEUVER_MODIFIER_RIGHT
+                            ?: ManeuverModifier.RIGHT
                     )
                 }
             }
@@ -499,7 +499,7 @@ class MapboxTripNotification constructor(
     ): Bitmap? {
         val maneuver = when {
             MANEUVER_TYPES_WITH_NULL_MODIFIERS.contains(maneuverType) -> Pair(maneuverType, null)
-            !STEP_MANEUVER_TYPE_ARRIVE.contentEquals(maneuverType) && maneuverModifier != null -> Pair(
+            !StepManeuver.ARRIVE.contentEquals(maneuverType) && maneuverModifier != null -> Pair(
                 null,
                 maneuverModifier
             )
diff --git a/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/internal/TimeFormatter.kt b/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/internal/TimeFormatter.kt
index 57047d29120..c5ecb62792c 100644
--- a/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/internal/TimeFormatter.kt
+++ b/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/internal/TimeFormatter.kt
@@ -6,7 +6,7 @@ import android.graphics.Typeface
 import android.text.SpannableStringBuilder
 import android.text.style.RelativeSizeSpan
 import android.text.style.StyleSpan
-import com.mapbox.navigation.base.typedef.TimeFormatType
+import com.mapbox.navigation.base.TimeFormat
 import com.mapbox.navigation.trip.notification.R
 import com.mapbox.navigation.trip.notification.time.TimeFormattingChain
 import com.mapbox.navigation.trip.notification.time.span.SpanItem
@@ -29,7 +29,7 @@ object TimeFormatter {
      *
      * @param time Calendar
      * @param routeDuration duration in seconds
-     * @param type [TimeFormatType]
+     * @param type [TimeFormat.Type]
      * @param isDeviceTwentyFourHourFormat *true* if 24-hour format, *false* otherwise
      * @return String
      */
@@ -37,7 +37,7 @@ object TimeFormatter {
     fun formatTime(
         time: Calendar,
         routeDuration: Double,
-        @TimeFormatType type: Int,
+        @TimeFormat.Type type: Int,
         isDeviceTwentyFourHourFormat: Boolean
     ): String {
         time.add(Calendar.SECOND, routeDuration.toInt())
diff --git a/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/internal/maneuver/ManeuverIconHelper.kt b/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/internal/maneuver/ManeuverIconHelper.kt
index 21fcaa4ffd6..81c834c34ab 100644
--- a/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/internal/maneuver/ManeuverIconHelper.kt
+++ b/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/internal/maneuver/ManeuverIconHelper.kt
@@ -3,106 +3,7 @@ package com.mapbox.navigation.trip.notification.internal.maneuver
 import android.graphics.Canvas
 import android.graphics.PointF
 import androidx.core.util.Pair
-
-// Step Maneuver Types
-/**
- * Step maneuver type *turn*
- */
-const val STEP_MANEUVER_TYPE_TURN = "turn"
-/**
- * Step maneuver type *new name*
- */
-const val STEP_MANEUVER_TYPE_NEW_NAME = "new name"
-/**
- * Step maneuver type *depart*
- */
-const val STEP_MANEUVER_TYPE_DEPART = "depart"
-/**
- * Step maneuver type *arrive*
- */
-const val STEP_MANEUVER_TYPE_ARRIVE = "arrive"
-/**
- * Step maneuver type *merge*
- */
-const val STEP_MANEUVER_TYPE_MERGE = "merge"
-/**
- * Step maneuver type *on ramp*
- */
-const val STEP_MANEUVER_TYPE_ON_RAMP = "on ramp"
-/**
- * Step maneuver type *off ramp*
- */
-const val STEP_MANEUVER_TYPE_OFF_RAMP = "off ramp"
-/**
- * Step maneuver type *fork*
- */
-const val STEP_MANEUVER_TYPE_FORK = "fork"
-/**
- * Step maneuver type *end of road*
- */
-const val STEP_MANEUVER_TYPE_END_OF_ROAD = "end of road"
-/**
- * Step maneuver type *continue*
- */
-const val STEP_MANEUVER_TYPE_CONTINUE = "continue"
-/**
- * Step maneuver type *roundabout*
- */
-const val STEP_MANEUVER_TYPE_ROUNDABOUT = "roundabout"
-/**
- * Step maneuver type *rotary*
- */
-const val STEP_MANEUVER_TYPE_ROTARY = "rotary"
-/**
- * Step maneuver type *roundabout turn*
- */
-const val STEP_MANEUVER_TYPE_ROUNDABOUT_TURN = "roundabout turn"
-/**
- * Step maneuver type *notification*
- */
-const val STEP_MANEUVER_TYPE_NOTIFICATION = "notification"
-/**
- * Step maneuver type *exit roundabout*
- */
-const val STEP_MANEUVER_TYPE_EXIT_ROUNDABOUT = "exit roundabout"
-/**
- * Step maneuver type *exit rotary*
- */
-const val STEP_MANEUVER_TYPE_EXIT_ROTARY = "exit rotary"
-
-// Step Maneuver Modifiers
-/**
- * Step maneuver modifier *u turn*
- */
-const val STEP_MANEUVER_MODIFIER_UTURN = "uturn"
-/**
- * Step maneuver modifier *sharp right*
- */
-const val STEP_MANEUVER_MODIFIER_SHARP_RIGHT = "sharp right"
-/**
- * Step maneuver modifier *right*
- */
-const val STEP_MANEUVER_MODIFIER_RIGHT = "right"
-/**
- * Step maneuver modifier *slight right*
- */
-const val STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT = "slight right"
-/**
- * Step maneuver modifier *straight*
- */
-const val STEP_MANEUVER_MODIFIER_STRAIGHT = "straight"
-/**
- * Step maneuver modifier *slight left*
- */
-const val STEP_MANEUVER_MODIFIER_SLIGHT_LEFT = "slight left"
-/**
- * Step maneuver modifier *left*
- */
-const val STEP_MANEUVER_MODIFIER_LEFT = "left"
-/**
- * Step maneuver modifier *sharp left*
- */
-const val STEP_MANEUVER_MODIFIER_SHARP_LEFT = "sharp left"
+import com.mapbox.api.directions.v5.models.StepManeuver
 
 /**
  * A helping class for creating maneuvers that are draw on the [Canvas]
@@ -124,7 +25,7 @@ object ManeuverIconHelper {
     val MANEUVER_ICON_DRAWER_MAP: Map<Pair<String, String>, ManeuverIconDrawer> =
         object : HashMap<Pair<String, String>, ManeuverIconDrawer>() {
             init {
-                put(Pair(STEP_MANEUVER_TYPE_MERGE, null),
+                put(Pair(StepManeuver.MERGE, null),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -136,7 +37,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawMerge(canvas, primaryColor, secondaryColor, size)
                         }
                     })
-                put(Pair(STEP_MANEUVER_TYPE_OFF_RAMP, null),
+                put(Pair(StepManeuver.OFF_RAMP, null),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -153,7 +54,7 @@ object ManeuverIconHelper {
                             )
                         }
                     })
-                put(Pair(STEP_MANEUVER_TYPE_FORK, null),
+                put(Pair(StepManeuver.FORK, null),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -165,7 +66,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawFork(canvas, primaryColor, secondaryColor, size)
                         }
                     })
-                put(Pair(STEP_MANEUVER_TYPE_ROUNDABOUT, null),
+                put(Pair(StepManeuver.ROUNDABOUT, null),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -183,7 +84,7 @@ object ManeuverIconHelper {
                             )
                         }
                     })
-                put(Pair(STEP_MANEUVER_TYPE_ROUNDABOUT_TURN, null),
+                put(Pair(StepManeuver.ROUNDABOUT_TURN, null),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -201,7 +102,7 @@ object ManeuverIconHelper {
                             )
                         }
                     })
-                put(Pair(STEP_MANEUVER_TYPE_EXIT_ROUNDABOUT, null),
+                put(Pair(StepManeuver.EXIT_ROUNDABOUT, null),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -219,7 +120,7 @@ object ManeuverIconHelper {
                             )
                         }
                     })
-                put(Pair(STEP_MANEUVER_TYPE_ROTARY, null),
+                put(Pair(StepManeuver.ROTARY, null),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -237,7 +138,7 @@ object ManeuverIconHelper {
                             )
                         }
                     })
-                put(Pair(STEP_MANEUVER_TYPE_EXIT_ROTARY, null),
+                put(Pair(StepManeuver.EXIT_ROTARY, null),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -255,7 +156,7 @@ object ManeuverIconHelper {
                             )
                         }
                     })
-                put(Pair(STEP_MANEUVER_TYPE_ARRIVE, null),
+                put(Pair(StepManeuver.ARRIVE, null),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -267,7 +168,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawArrive(canvas, primaryColor, size)
                         }
                     })
-                put(Pair(STEP_MANEUVER_TYPE_ARRIVE, STEP_MANEUVER_MODIFIER_STRAIGHT),
+                put(Pair(StepManeuver.ARRIVE, ManeuverModifier.STRAIGHT),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -279,7 +180,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawArrive(canvas, primaryColor, size)
                         }
                     })
-                put(Pair(STEP_MANEUVER_TYPE_ARRIVE, STEP_MANEUVER_MODIFIER_RIGHT),
+                put(Pair(StepManeuver.ARRIVE, ManeuverModifier.RIGHT),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -291,7 +192,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawArriveRight(canvas, primaryColor, size)
                         }
                     })
-                put(Pair(STEP_MANEUVER_TYPE_ARRIVE, STEP_MANEUVER_MODIFIER_LEFT),
+                put(Pair(StepManeuver.ARRIVE, ManeuverModifier.LEFT),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -303,7 +204,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawArriveRight(canvas, primaryColor, size)
                         }
                     })
-                put(Pair(null, STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT),
+                put(Pair(null, ManeuverModifier.SLIGHT_RIGHT),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -315,7 +216,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawArrowSlightRight(canvas, primaryColor, size)
                         }
                     })
-                put(Pair(null, STEP_MANEUVER_MODIFIER_RIGHT),
+                put(Pair(null, ManeuverModifier.RIGHT),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -327,7 +228,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawArrowRight(canvas, primaryColor, size)
                         }
                     })
-                put(Pair(null, STEP_MANEUVER_MODIFIER_SHARP_RIGHT),
+                put(Pair(null, ManeuverModifier.SHARP_RIGHT),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -339,7 +240,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawArrowSharpRight(canvas, primaryColor, size)
                         }
                     })
-                put(Pair(null, STEP_MANEUVER_MODIFIER_SLIGHT_LEFT),
+                put(Pair(null, ManeuverModifier.SLIGHT_LEFT),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -351,7 +252,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawArrowSlightRight(canvas, primaryColor, size)
                         }
                     })
-                put(Pair(null, STEP_MANEUVER_MODIFIER_LEFT),
+                put(Pair(null, ManeuverModifier.LEFT),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -363,7 +264,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawArrowRight(canvas, primaryColor, size)
                         }
                     })
-                put(Pair(null, STEP_MANEUVER_MODIFIER_SHARP_LEFT),
+                put(Pair(null, ManeuverModifier.SHARP_LEFT),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -375,7 +276,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawArrowSharpRight(canvas, primaryColor, size)
                         }
                     })
-                put(Pair(null, STEP_MANEUVER_MODIFIER_UTURN),
+                put(Pair(null, ManeuverModifier.UTURN),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -387,7 +288,7 @@ object ManeuverIconHelper {
                             ManeuversStyleKit.drawArrow180Right(canvas, primaryColor, size)
                         }
                     })
-                put(Pair(null, STEP_MANEUVER_MODIFIER_STRAIGHT),
+                put(Pair(null, ManeuverModifier.STRAIGHT),
                     object : ManeuverIconDrawer {
                         override fun drawManeuverIcon(
                             canvas: Canvas,
@@ -420,10 +321,10 @@ object ManeuverIconHelper {
     @JvmField
     val SHOULD_FLIP_MODIFIERS: Set<String> = object : HashSet<String>() {
         init {
-            add(STEP_MANEUVER_MODIFIER_SLIGHT_LEFT)
-            add(STEP_MANEUVER_MODIFIER_LEFT)
-            add(STEP_MANEUVER_MODIFIER_SHARP_LEFT)
-            add(STEP_MANEUVER_MODIFIER_UTURN)
+            add(ManeuverModifier.SLIGHT_LEFT)
+            add(ManeuverModifier.LEFT)
+            add(ManeuverModifier.SHARP_LEFT)
+            add(ManeuverModifier.UTURN)
         }
     }
 
@@ -433,11 +334,11 @@ object ManeuverIconHelper {
     @JvmField
     val ROUNDABOUT_MANEUVER_TYPES: Set<String> = object : HashSet<String>() {
         init {
-            add(STEP_MANEUVER_TYPE_ROTARY)
-            add(STEP_MANEUVER_TYPE_ROUNDABOUT)
-            add(STEP_MANEUVER_TYPE_ROUNDABOUT_TURN)
-            add(STEP_MANEUVER_TYPE_EXIT_ROUNDABOUT)
-            add(STEP_MANEUVER_TYPE_EXIT_ROTARY)
+            add(StepManeuver.ROTARY)
+            add(StepManeuver.ROUNDABOUT)
+            add(StepManeuver.ROUNDABOUT_TURN)
+            add(StepManeuver.EXIT_ROUNDABOUT)
+            add(StepManeuver.EXIT_ROTARY)
         }
     }
 
@@ -447,13 +348,13 @@ object ManeuverIconHelper {
     @JvmField
     val MANEUVER_TYPES_WITH_NULL_MODIFIERS: Set<String> = object : HashSet<String>() {
         init {
-            add(STEP_MANEUVER_TYPE_OFF_RAMP)
-            add(STEP_MANEUVER_TYPE_FORK)
-            add(STEP_MANEUVER_TYPE_ROUNDABOUT)
-            add(STEP_MANEUVER_TYPE_ROUNDABOUT_TURN)
-            add(STEP_MANEUVER_TYPE_EXIT_ROUNDABOUT)
-            add(STEP_MANEUVER_TYPE_ROTARY)
-            add(STEP_MANEUVER_TYPE_EXIT_ROTARY)
+            add(StepManeuver.OFF_RAMP)
+            add(StepManeuver.FORK)
+            add(StepManeuver.ROUNDABOUT)
+            add(StepManeuver.ROUNDABOUT_TURN)
+            add(StepManeuver.EXIT_ROUNDABOUT)
+            add(StepManeuver.ROTARY)
+            add(StepManeuver.EXIT_ROTARY)
         }
     }
 
@@ -466,10 +367,10 @@ object ManeuverIconHelper {
         maneuverModifier: String?,
         drivingSide: String?
     ): Boolean {
-        val leftDriving = STEP_MANEUVER_MODIFIER_LEFT == drivingSide
+        val leftDriving = ManeuverModifier.LEFT == drivingSide
         val roundaboutManeuverType = ROUNDABOUT_MANEUVER_TYPES.contains(maneuverType)
         val uturnManeuverModifier =
-            !maneuverModifier.isNullOrBlank() && STEP_MANEUVER_MODIFIER_UTURN.contains(
+            !maneuverModifier.isNullOrBlank() && ManeuverModifier.UTURN.contains(
                 maneuverModifier
             )
 
diff --git a/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/internal/maneuver/ManeuverModifier.kt b/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/internal/maneuver/ManeuverModifier.kt
new file mode 100644
index 00000000000..708e0a9626b
--- /dev/null
+++ b/libtrip-notification/src/main/java/com/mapbox/navigation/trip/notification/internal/maneuver/ManeuverModifier.kt
@@ -0,0 +1,60 @@
+package com.mapbox.navigation.trip.notification.internal.maneuver
+
+import androidx.annotation.StringDef
+
+object ManeuverModifier {
+    /**
+     * Indicates "uturn" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
+     */
+    const val UTURN = "uturn"
+
+    /**
+     * Indicates "sharp right" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
+     */
+    const val SHARP_RIGHT = "sharp right"
+
+    /**
+     * Indicates "right" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
+     */
+    const val RIGHT = "right"
+
+    /**
+     * Indicates "slight right" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
+     */
+    const val SLIGHT_RIGHT = "slight right"
+
+    /**
+     * Indicates "straight" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
+     */
+    const val STRAIGHT = "straight"
+
+    /**
+     * Indicates "slight left" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
+     */
+    const val SLIGHT_LEFT = "slight left"
+
+    /**
+     * Indicates "left" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
+     */
+    const val LEFT = "left"
+
+    /**
+     * Indicates "sharp left" maneuver modifier to be rendered in the [com.mapbox.navigation.ui.instruction.maneuver.ManeuverView]
+     */
+    const val SHARP_LEFT = "sharp left"
+
+    /**
+     * Representation of ManeuverModifier in form of logical types
+     */
+    @StringDef(
+        UTURN,
+        SHARP_RIGHT,
+        RIGHT,
+        SLIGHT_RIGHT,
+        STRAIGHT,
+        SLIGHT_LEFT,
+        LEFT,
+        SHARP_LEFT
+    )
+    annotation class Type
+}
diff --git a/libtrip-notification/src/test/java/com/mapbox/navigation/trip/notification/internal/TimeFormatterTest.kt b/libtrip-notification/src/test/java/com/mapbox/navigation/trip/notification/internal/TimeFormatterTest.kt
index c8c8b96a010..bdc202a7749 100644
--- a/libtrip-notification/src/test/java/com/mapbox/navigation/trip/notification/internal/TimeFormatterTest.kt
+++ b/libtrip-notification/src/test/java/com/mapbox/navigation/trip/notification/internal/TimeFormatterTest.kt
@@ -5,9 +5,9 @@ import android.graphics.Typeface
 import android.text.style.RelativeSizeSpan
 import android.text.style.StyleSpan
 import androidx.test.core.app.ApplicationProvider
-import com.mapbox.navigation.base.typedef.NONE_SPECIFIED
-import com.mapbox.navigation.base.typedef.TWELVE_HOURS
-import com.mapbox.navigation.base.typedef.TWENTY_FOUR_HOURS
+import com.mapbox.navigation.base.TimeFormat.NONE_SPECIFIED
+import com.mapbox.navigation.base.TimeFormat.TWELVE_HOURS
+import com.mapbox.navigation.base.TimeFormat.TWENTY_FOUR_HOURS
 import java.util.GregorianCalendar
 import java.util.Locale
 import org.junit.Assert.assertEquals