diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java
index 3a439ec7ea..fbab69e62f 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java
@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.mogo.och.taxi.passenger.R;
-import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils;
+import com.mogo.eagle.core.widget.indicator.utils.IndicatorUtils;
 
 public class AttrsController {
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt
index 47a993e1d7..0bcf57b165 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt
@@ -7,7 +7,7 @@ import com.mogo.och.taxi.passenger.widget.indicator.annotation.AIndicatorSlideMo
 import com.mogo.och.taxi.passenger.widget.indicator.annotation.AIndicatorStyle
 import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorOrientation
 import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorSlideMode
-import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils
+import com.mogo.eagle.core.widget.indicator.utils.IndicatorUtils
 
 /**
  * <pre>
diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/drawer/CircleDrawer.kt b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/drawer/CircleDrawer.kt
index 95a9e11103..f2c6a1ab86 100644
--- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/drawer/CircleDrawer.kt
+++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/drawer/CircleDrawer.kt
@@ -5,7 +5,7 @@ import android.graphics.RectF
 import com.mogo.eagle.core.widget.indicator.enums.IndicatorSlideMode
 
 import com.mogo.eagle.core.widget.indicator.option.IndicatorOptions
-import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils
+import com.mogo.eagle.core.widget.indicator.utils.IndicatorUtils
 
 /**
  * <pre>
diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/drawer/RectDrawer.kt b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/drawer/RectDrawer.kt
index 32e3c19f74..422227bb96 100644
--- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/drawer/RectDrawer.kt
+++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/drawer/RectDrawer.kt
@@ -4,7 +4,7 @@ import android.graphics.*
 
 import com.mogo.eagle.core.widget.indicator.enums.IndicatorSlideMode
 import com.mogo.eagle.core.widget.indicator.option.IndicatorOptions
-import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils
+import com.mogo.eagle.core.widget.indicator.utils.IndicatorUtils
 
 /**
  * <pre>
diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/option/AttrsController.java b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/option/AttrsController.java
index b804db3be2..1341df1424 100644
--- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/option/AttrsController.java
+++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/option/AttrsController.java
@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.mogo.eagle.core.widget.R;
-import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils;
+import com.mogo.eagle.core.widget.indicator.utils.IndicatorUtils;
 
 public class AttrsController {
 
diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/option/IndicatorOptions.kt b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/option/IndicatorOptions.kt
index ecf6387870..eb16af1323 100644
--- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/option/IndicatorOptions.kt
+++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/option/IndicatorOptions.kt
@@ -7,7 +7,7 @@ import com.mogo.eagle.core.widget.indicator.annotation.AIndicatorSlideMode
 import com.mogo.eagle.core.widget.indicator.annotation.AIndicatorStyle
 import com.mogo.eagle.core.widget.indicator.enums.IndicatorOrientation
 import com.mogo.eagle.core.widget.indicator.enums.IndicatorSlideMode
-import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils
+import com.mogo.eagle.core.widget.indicator.utils.IndicatorUtils
 
 /**
  * <pre>
diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/utils/IndicatorUtils.kt b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/utils/IndicatorUtils.kt
index 8f80357655..b78a869540 100644
--- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/utils/IndicatorUtils.kt
+++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/indicator/utils/IndicatorUtils.kt
@@ -1,7 +1,6 @@
-package com.mogo.och.taxi.passenger.widget.indicator.utils
+package com.mogo.eagle.core.widget.indicator.utils
 
 import android.content.res.Resources
-
 import com.mogo.eagle.core.widget.indicator.option.IndicatorOptions
 
 /**