diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java
index d26ce2e..be63b17 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java
@@ -514,10 +514,6 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
     mWakeLock.release();
   }
 
-  private String getStorageState(File f) {
-    return EnvironmentCompat.getStorageState(f); //Environment.MEDIA_MOUNTED
-  }
-
   public ArrayList<File> getStorageDirectories() {
     ArrayList<File> list = null;
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
@@ -530,7 +526,7 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
     if (list != null) {
       for (File f : list) {
         if (f != null) {
-          if (getStorageState(f).equals(Environment.MEDIA_MOUNTED))
+          if (EnvironmentCompat.getStorageState(f).equals(Environment.MEDIA_MOUNTED))
             res.add(f);
         }
       }
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
index 3edae99..ada4a39 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
@@ -171,24 +171,7 @@ public class BRouterView extends View {
       String basedir = baseDir.getAbsolutePath();
       AppLogger.log("using basedir: " + basedir);
 
-      String version = "v" + getContext().getString(R.string.app_version);
-
-      // create missing directories
-      assertDirectoryExists("project directory", new File(basedir, "brouter"), null, null);
-      segmentDir = new File(basedir, "/brouter/segments4");
-      if (assertDirectoryExists("data directory", segmentDir, "segments4.zip", null)) {
-        ConfigMigration.tryMigrateStorageConfig(
-          new File(basedir + "/brouter/segments3/storageconfig.txt"),
-          new File(basedir + "/brouter/segments4/storageconfig.txt"));
-      }
-      profileDir = new File(basedir, "brouter/profiles2");
-      assertDirectoryExists("profile directory", profileDir, "profiles2.zip", version);
-      modesDir = new File(basedir, "/brouter/modes");
-      assertDirectoryExists("modes directory", modesDir, "modes.zip", version);
-      assertDirectoryExists("readmes directory", new File(basedir, "brouter/readmes"), "readmes.zip", version);
-
-      File inputDir = new File(basedir, "brouter/import");
-      assertDirectoryExists("input directory", inputDir, null, version);
+      populateBasedir(basedir);
 
       // new init is done move old files
       if (waitingForMigration) {
@@ -294,6 +277,27 @@ public class BRouterView extends View {
     waitingForSelection = true;
   }
 
+  private void populateBasedir(String basedir) {
+    String version = "v" + getContext().getString(R.string.app_version);
+
+    // create missing directories
+    assertDirectoryExists("project directory", new File(basedir, "brouter"), null, null);
+    segmentDir = new File(basedir, "/brouter/segments4");
+    if (assertDirectoryExists("data directory", segmentDir, "segments4.zip", null)) {
+      ConfigMigration.tryMigrateStorageConfig(
+        new File(basedir + "/brouter/segments3/storageconfig.txt"),
+        new File(basedir + "/brouter/segments4/storageconfig.txt"));
+    }
+    profileDir = new File(basedir, "brouter/profiles2");
+    assertDirectoryExists("profile directory", profileDir, "profiles2.zip", version);
+    modesDir = new File(basedir, "/brouter/modes");
+    assertDirectoryExists("modes directory", modesDir, "modes.zip", version);
+    assertDirectoryExists("readmes directory", new File(basedir, "brouter/readmes"), "readmes.zip", version);
+
+    File inputDir = new File(basedir, "brouter/import");
+    assertDirectoryExists("input directory", inputDir, null, version);
+  }
+
   private void moveFolders(String oldMigrationPath, String basedir) {
     File oldDir = new File(oldMigrationPath);
     File[] oldFiles = oldDir.listFiles();