diff --git a/android/app/src/flavors/firebase-enabled/com/mapswithme/util/CrashlyticsUtils.java b/android/app/src/flavors/firebase-enabled/app/organicmaps/util/CrashlyticsUtils.java
similarity index 100%
rename from android/app/src/flavors/firebase-enabled/com/mapswithme/util/CrashlyticsUtils.java
rename to android/app/src/flavors/firebase-enabled/app/organicmaps/util/CrashlyticsUtils.java
diff --git a/android/app/src/flavors/world-enabled/World.mwm b/android/app/src/flavors/world-enabled/World.mwm
index e2572d530b..22ac554c21 120000
--- a/android/app/src/flavors/world-enabled/World.mwm
+++ b/android/app/src/flavors/world-enabled/World.mwm
@@ -1 +1 @@
-../../../data/World.mwm
\ No newline at end of file
+../../../../../data/World.mwm
\ No newline at end of file
diff --git a/android/app/src/flavors/world-enabled/WorldCoasts.mwm b/android/app/src/flavors/world-enabled/WorldCoasts.mwm
index 846fc5ce30..9b9afc3a61 120000
--- a/android/app/src/flavors/world-enabled/WorldCoasts.mwm
+++ b/android/app/src/flavors/world-enabled/WorldCoasts.mwm
@@ -1 +1 @@
-../../../data/WorldCoasts.mwm
\ No newline at end of file
+../../../../../data/WorldCoasts.mwm
\ No newline at end of file