diff --git a/android/app/src/main/java/app/organicmaps/sdk/ChoosePositionMode.java b/android/sdk/src/main/java/app/organicmaps/sdk/ChoosePositionMode.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/ChoosePositionMode.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/ChoosePositionMode.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java b/android/sdk/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/Framework.java b/android/sdk/src/main/java/app/organicmaps/sdk/Framework.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/Framework.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/Framework.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/Map.java b/android/sdk/src/main/java/app/organicmaps/sdk/Map.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/Map.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/Map.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/MapRenderingListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/MapRenderingListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/MapRenderingListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/MapRenderingListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/MapStyle.java b/android/sdk/src/main/java/app/organicmaps/sdk/MapStyle.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/MapStyle.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/MapStyle.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/Router.java b/android/sdk/src/main/java/app/organicmaps/sdk/Router.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/Router.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/Router.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java b/android/sdk/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java b/android/sdk/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java b/android/sdk/src/main/java/app/organicmaps/sdk/api/RequestType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/api/RequestType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/api/RoutePoint.java b/android/sdk/src/main/java/app/organicmaps/sdk/api/RoutePoint.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/api/RoutePoint.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/api/RoutePoint.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DataChangedListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/DataChangedListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DataChangedListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/DataChangedListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/content/DataSource.java b/android/sdk/src/main/java/app/organicmaps/sdk/content/DataSource.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/content/DataSource.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/content/DataSource.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/display/DisplayManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/display/DisplayManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/display/DisplayManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/display/DisplayManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/display/DisplayType.java b/android/sdk/src/main/java/app/organicmaps/sdk/display/DisplayType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/display/DisplayType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/display/DisplayType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/downloader/Android7RootCertificateWorkaround.java b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/Android7RootCertificateWorkaround.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/downloader/Android7RootCertificateWorkaround.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/downloader/Android7RootCertificateWorkaround.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/Language.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/Language.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/Language.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/Language.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/LocationListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/LocationListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/LocationListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/LocationState.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationState.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/LocationState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/LocationState.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/SensorHelper.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/SensorHelper.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/SensorListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/SensorListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/SensorListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/SensorListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/CarDirection.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/CarDirection.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/CarDirection.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/CarDirection.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/JunctionInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/JunctionInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/JunctionInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/JunctionInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/LaneWay.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/LaneWay.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/LaneWay.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/LaneWay.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/PedestrianTurnDirection.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/PedestrianTurnDirection.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/PedestrianTurnDirection.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/PedestrianTurnDirection.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RouteMarkData.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RouteMarkData.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RouteMarkData.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RouteMarkData.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RouteMarkType.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RouteMarkType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RouteMarkType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RouteMarkType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RouteRecommendationType.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RouteRecommendationType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RouteRecommendationType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RouteRecommendationType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingController.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingController.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingController.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingController.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingLoadPointsListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingLoadPointsListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingLoadPointsListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingLoadPointsListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingProgressListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingProgressListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingProgressListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingProgressListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingRecommendationListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingRecommendationListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingRecommendationListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingRecommendationListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/TransitRouteInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitRouteInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/TransitRouteInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitRouteInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitStepInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitStepInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/BookmarkSearchListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/BookmarkSearchListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/BookmarkSearchListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/BookmarkSearchListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/DisplayedCategories.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/DisplayedCategories.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/DisplayedCategories.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/DisplayedCategories.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/MapSearchListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/MapSearchListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/MapSearchListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/MapSearchListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/Popularity.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/Popularity.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/Popularity.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/Popularity.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/SearchEngine.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/SearchEngine.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/SearchListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/SearchListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/SearchListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/SearchRecents.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/SearchRecents.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/SearchResult.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/SearchResult.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/RoadType.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/settings/RoadType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/StorageItem.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/StorageItem.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/settings/StorageItem.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/settings/StorageItem.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/sound/LanguageData.java b/android/sdk/src/main/java/app/organicmaps/sdk/sound/LanguageData.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/sound/LanguageData.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/sound/LanguageData.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java b/android/sdk/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java b/android/sdk/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/BatteryState.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/BatteryState.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/BatteryState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/BatteryState.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Config.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/Config.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/ConnectionState.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/ConnectionState.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/ConnectionState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/ConnectionState.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Constants.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/Constants.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/DateUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/DateUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Distance.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/Distance.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/GeoUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/GeoUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/GeoUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/GeoUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/HttpClient.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/HttpClient.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/KeyValue.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/KeyValue.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/KeyValue.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/KeyValue.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Language.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Language.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/Language.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/Language.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/LocationUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/LocationUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/PowerManagment.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/PowerManagment.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/PowerManagment.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/PowerManagment.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/ROMUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/ROMUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/ROMUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/ROMUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/SecureStorage.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/SecureStorage.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/SecureStorage.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/SecureStorage.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/StorageUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/StorageUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/StorageUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/StorageUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Utils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Utils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/Utils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/Utils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java b/android/sdk/src/main/java/app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java b/android/sdk/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java b/android/sdk/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java
diff --git a/android/app/src/main/java/org/chromium/base/ObserverList.java b/android/sdk/src/main/java/org/chromium/base/ObserverList.java
similarity index 100%
rename from android/app/src/main/java/org/chromium/base/ObserverList.java
rename to android/sdk/src/main/java/org/chromium/base/ObserverList.java
diff --git a/android/app/src/test/java/org/chromium/base/ObserverListTest.java b/android/sdk/src/test/java/org/chromium/base/ObserverListTest.java
similarity index 100%
rename from android/app/src/test/java/org/chromium/base/ObserverListTest.java
rename to android/sdk/src/test/java/org/chromium/base/ObserverListTest.java