diff --git a/android/app/src/main/java/app/organicmaps/MwmApplication.java b/android/app/src/main/java/app/organicmaps/MwmApplication.java
index c15ae62d4..4bb8d07eb 100644
--- a/android/app/src/main/java/app/organicmaps/MwmApplication.java
+++ b/android/app/src/main/java/app/organicmaps/MwmApplication.java
@@ -15,7 +15,6 @@ import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;
 import app.organicmaps.background.OsmUploadWork;
-import app.organicmaps.downloader.Android7RootCertificateWorkaround;
 import app.organicmaps.downloader.DownloaderNotifier;
 import app.organicmaps.location.TrackRecordingService;
 import app.organicmaps.routing.NavigationService;
@@ -123,8 +122,6 @@ public class MwmApplication extends Application implements Application.ActivityL
 
     LogsManager.INSTANCE.initFileLogging(this);
 
-    Android7RootCertificateWorkaround.initializeIfNeeded(this);
-
     ConnectionState.INSTANCE.initialize(this);
 
     DownloaderNotifier.createNotificationChannel(this);
diff --git a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
index 4c3aa699e..1bb583681 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
@@ -8,6 +8,7 @@ import androidx.lifecycle.ProcessLifecycleOwner;
 import app.organicmaps.R;
 import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
+import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround;
 import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.location.SensorHelper;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
@@ -82,6 +83,8 @@ public final class OrganicMaps implements DefaultLifecycleObserver
 
     Config.init(mContext);
 
+    Android7RootCertificateWorkaround.initializeIfNeeded(mContext);
+
     mSensorHelper = new SensorHelper(mContext);
     mLocationHelper = new LocationHelper(mContext, mSensorHelper);
     mIsolinesManager = new IsolinesManager(mContext);
diff --git a/android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java b/android/app/src/main/java/app/organicmaps/sdk/downloader/Android7RootCertificateWorkaround.java
similarity index 97%
rename from android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java
rename to android/app/src/main/java/app/organicmaps/sdk/downloader/Android7RootCertificateWorkaround.java
index f8f68f9d7..0409a148a 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/downloader/Android7RootCertificateWorkaround.java
@@ -1,8 +1,8 @@
-package app.organicmaps.downloader;
+package app.organicmaps.sdk.downloader;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import app.organicmaps.R;
+import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.util.log.Logger;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
diff --git a/android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java b/android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java
index ce2133137..353241ece 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java
@@ -3,7 +3,6 @@ package app.organicmaps.sdk.downloader;
 import android.os.AsyncTask;
 import android.util.Base64;
 import androidx.annotation.Keep;
-import app.organicmaps.downloader.Android7RootCertificateWorkaround;
 import app.organicmaps.sdk.util.Constants;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.Utils;
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java b/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java
index 515882e77..9c10ebd6d 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java
@@ -27,7 +27,7 @@ package app.organicmaps.sdk.util;
 import android.text.TextUtils;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
-import app.organicmaps.downloader.Android7RootCertificateWorkaround;
+import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround;
 import app.organicmaps.sdk.util.log.Logger;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/android/app/src/main/res/raw/globalsignr4 b/android/sdk/src/main/res/raw/globalsignr4
similarity index 100%
rename from android/app/src/main/res/raw/globalsignr4
rename to android/sdk/src/main/res/raw/globalsignr4
diff --git a/android/app/src/main/res/raw/gtsrootr1 b/android/sdk/src/main/res/raw/gtsrootr1
similarity index 100%
rename from android/app/src/main/res/raw/gtsrootr1
rename to android/sdk/src/main/res/raw/gtsrootr1
diff --git a/android/app/src/main/res/raw/gtsrootr2 b/android/sdk/src/main/res/raw/gtsrootr2
similarity index 100%
rename from android/app/src/main/res/raw/gtsrootr2
rename to android/sdk/src/main/res/raw/gtsrootr2
diff --git a/android/app/src/main/res/raw/gtsrootr3 b/android/sdk/src/main/res/raw/gtsrootr3
similarity index 100%
rename from android/app/src/main/res/raw/gtsrootr3
rename to android/sdk/src/main/res/raw/gtsrootr3
diff --git a/android/app/src/main/res/raw/gtsrootr4 b/android/sdk/src/main/res/raw/gtsrootr4
similarity index 100%
rename from android/app/src/main/res/raw/gtsrootr4
rename to android/sdk/src/main/res/raw/gtsrootr4
diff --git a/android/app/src/main/res/raw/isrgrootx1 b/android/sdk/src/main/res/raw/isrgrootx1
similarity index 100%
rename from android/app/src/main/res/raw/isrgrootx1
rename to android/sdk/src/main/res/raw/isrgrootx1