diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 9c546637a..8a26b4cd1 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -38,7 +38,6 @@ import app.organicmaps.bookmarks.BookmarksSharingHelper;
 import app.organicmaps.bookmarks.ChooseBookmarkCategoryFragment;
 import app.organicmaps.downloader.DownloaderStatusIcon;
 import app.organicmaps.downloader.MapManagerHelper;
-import app.organicmaps.editor.OhState;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
 import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
@@ -54,6 +53,7 @@ import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.editor.Editor;
+import app.organicmaps.sdk.editor.OhState;
 import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.HoursMinutes;
 import app.organicmaps.sdk.editor.data.Timetable;
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
index c06d332d8..c6b5f98b3 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
@@ -317,16 +317,16 @@ JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeCur
 
   /// @todo We should check closed/open time for specific feature's timezone.
   OpeningHours::InfoT ohInfo = MakeOpeningHours(tts).GetInfo(now);
-  jclass ohStateClass = jni::GetGlobalClassRef(env, "app/organicmaps/editor/OhState");
-  jclass ruleStateClass = jni::GetGlobalClassRef(env, "app/organicmaps/editor/OhState$State");
+  jclass ohStateClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/OhState");
+  jclass ruleStateClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/OhState$State");
 
   static std::unordered_map<RuleState, char const *> const ruleState = {
       {RuleState::Open, "Open"}, {RuleState::Closed, "Closed"}, {RuleState::Unknown, "Unknown"}};
 
   jfieldID stateField =
-      env->GetStaticFieldID(ruleStateClass, ruleState.at(ohInfo.state), "Lapp/organicmaps/editor/OhState$State;");
+      env->GetStaticFieldID(ruleStateClass, ruleState.at(ohInfo.state), "Lapp/organicmaps/sdk/editor/OhState$State;");
   jobject stateObj = env->GetStaticObjectField(ruleStateClass, stateField);
-  jmethodID constructor = env->GetMethodID(ohStateClass, "<init>", "(Lapp/organicmaps/editor/OhState$State;JJ)V");
+  jmethodID constructor = env->GetMethodID(ohStateClass, "<init>", "(Lapp/organicmaps/sdk/editor/OhState$State;JJ)V");
   jobject javaOhState =
       env->NewObject(ohStateClass, constructor, stateObj, (jlong)ohInfo.nextTimeOpen, (jlong)ohInfo.nextTimeClosed);
 
diff --git a/android/app/src/main/java/app/organicmaps/editor/OhState.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OhState.java
similarity index 93%
rename from android/app/src/main/java/app/organicmaps/editor/OhState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/OhState.java
index e957d9523..9059ba265 100644
--- a/android/app/src/main/java/app/organicmaps/editor/OhState.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OhState.java
@@ -1,4 +1,4 @@
-package app.organicmaps.editor;
+package app.organicmaps.sdk.editor;
 
 import androidx.annotation.Keep;
 
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
index 511839c48..528d2fb82 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
@@ -3,7 +3,7 @@ package app.organicmaps.sdk.editor;
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.editor.OhState;
+import app.organicmaps.sdk.editor.OhState;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;