diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp
index 66c2bcbe2..5a9df5298 100644
--- a/android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp
@@ -2,7 +2,7 @@
 
 #include "map/gps_tracker.hpp"
 
-#include "app/organicmaps/core/jni_helper.hpp"
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
 
 #include <chrono>
 
diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
index 7802dde29..ec16b2abc 100644
--- a/android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
@@ -324,7 +324,7 @@ Java_app_organicmaps_sdk_editor_OpeningHours_nativeIsTimetableStringValid(JNIEnv
 
 
 JNIEXPORT jobject JNICALL
-Java_app_organicmaps_editor_OpeningHours_nativeCurrentState(JNIEnv * env, jclass clazz, jobjectArray jTts)
+Java_app_organicmaps_sdk_editor_OpeningHours_nativeCurrentState(JNIEnv * env, jclass clazz, jobjectArray jTts)
 {
   TimeTableSet tts = NativeTimetableSet(env, jTts);
   time_t const now = time(nullptr);
diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp
index ae39ea14e..6b8f16f6d 100644
--- a/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp
@@ -10,7 +10,7 @@ GuiThread::GuiThread()
 {
   JNIEnv * env = jni::GetEnv();
 
-  m_class = GetGlobalClassRef(env, "app/organicmaps/sdk/util/concurrency/UiThread");
+  m_class = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/concurrency/UiThread");
   ASSERT(m_class, ());
 
   m_method = env->GetStaticMethodID(m_class, "forwardToMainThread", "(J)V");
diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp
index 6f4fe6371..d200d93bf 100644
--- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp
+++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp
@@ -2,7 +2,7 @@
 
 #include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/routing/SingleLaneInfo.hpp"
-#include "app/organicmaps/util/Distance.hpp"
+#include "app/organicmaps/sdk/util/Distance.hpp"
 
 #include "map/routing_manager.hpp"
 
diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp
index fd3cf07d7..f384c6cd7 100644
--- a/android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp
@@ -2,7 +2,7 @@
 
 #include "platform/settings.hpp"
 
-#include "app/organicmaps/core/jni_helper.hpp"
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
 
 extern "C"
 {
diff --git a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
index 74d88e65f..20a2c6713 100644
--- a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
+++ b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
@@ -2,7 +2,7 @@ package app.organicmaps.backup;
 
 import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_DEFAULT_COUNT;
 import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_KEY;
-import static app.organicmaps.util.StorageUtils.isFolderWritable;
+import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
 
 import android.app.Activity;
 import android.content.Context;
@@ -29,8 +29,8 @@ import java.util.List;
 import java.util.Locale;
 
 import app.organicmaps.R;
-import app.organicmaps.util.UiUtils;
-import app.organicmaps.util.log.Logger;
+import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.sdk.util.log.Logger;
 
 public class BackupUtils
 {
diff --git a/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java b/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java
index 628b951a7..f560fe946 100644
--- a/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java
+++ b/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java
@@ -2,8 +2,8 @@ package app.organicmaps.backup;
 
 import static app.organicmaps.backup.BackupUtils.getBackupName;
 import static app.organicmaps.backup.BackupUtils.getBackupFolders;
-import static app.organicmaps.util.StorageUtils.copyFileToDocumentFile;
-import static app.organicmaps.util.StorageUtils.deleteDirectoryRecursive;
+import static app.organicmaps.sdk.util.StorageUtils.copyFileToDocumentFile;
+import static app.organicmaps.sdk.util.StorageUtils.deleteDirectoryRecursive;
 
 import android.app.Activity;
 import android.net.Uri;
@@ -17,13 +17,13 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 
-import app.organicmaps.bookmarks.data.BookmarkCategory;
-import app.organicmaps.bookmarks.data.BookmarkManager;
-import app.organicmaps.bookmarks.data.BookmarkSharingResult;
-import app.organicmaps.bookmarks.data.KmlFileType;
-import app.organicmaps.util.concurrency.ThreadPool;
-import app.organicmaps.util.concurrency.UiThread;
-import app.organicmaps.util.log.Logger;
+import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
+import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
+import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
+import app.organicmaps.sdk.bookmarks.data.KmlFileType;
+import app.organicmaps.sdk.util.concurrency.ThreadPool;
+import app.organicmaps.sdk.util.concurrency.UiThread;
+import app.organicmaps.sdk.util.log.Logger;
 
 public class LocalBackupManager implements BookmarkManager.BookmarksSharingListener
 {
diff --git a/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java b/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java
index a2d95198f..0f0be9af8 100644
--- a/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java
+++ b/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java
@@ -5,14 +5,14 @@ import static app.organicmaps.backup.BackupUtils.isBackupFolderAvailable;
 import static app.organicmaps.settings.BackupSettingsFragment.BACKUP_FOLDER_PATH_KEY;
 import static app.organicmaps.settings.BackupSettingsFragment.BACKUP_INTERVAL_KEY;
 import static app.organicmaps.settings.BackupSettingsFragment.LAST_BACKUP_TIME_KEY;
-import static app.organicmaps.util.StorageUtils.isFolderWritable;
+import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
 
 import androidx.preference.PreferenceManager;
 
-import app.organicmaps.util.log.Logger;
+import app.organicmaps.sdk.util.log.Logger;
 
 public class PeriodicBackupRunner
 {
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java b/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
index c2d970773..cbc5579a0 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
@@ -4,6 +4,7 @@ import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import app.organicmaps.editor.OhState;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
 
diff --git a/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java
index a544db49b..1716a4d08 100644
--- a/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java
@@ -3,7 +3,7 @@ package app.organicmaps.settings;
 import static app.organicmaps.backup.BackupUtils.formatReadableFolderPath;
 import static app.organicmaps.backup.BackupUtils.getMaxBackups;
 import static app.organicmaps.backup.BackupUtils.isBackupFolderAvailable;
-import static app.organicmaps.util.StorageUtils.isFolderWritable;
+import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -27,7 +27,7 @@ import java.text.DateFormat;
 
 import app.organicmaps.R;
 import app.organicmaps.backup.LocalBackupManager;
-import app.organicmaps.util.log.Logger;
+import app.organicmaps.sdk.util.log.Logger;
 
 
 public class BackupSettingsFragment