diff --git a/src/android/src/net/sf/nootka/ToutVolume.java b/src/Java-TODO/ToutVolume.java
similarity index 96%
rename from src/android/src/net/sf/nootka/ToutVolume.java
rename to src/Java-TODO/ToutVolume.java
index 0d244e6bffce984883728392f2da51780b2998d7..5d800c4ba9a13f1bacd43bc52502e78e2b24bd75 100644
--- a/src/android/src/net/sf/nootka/ToutVolume.java
+++ b/src/Java-TODO/ToutVolume.java
@@ -18,7 +18,8 @@
 
 package net.sf.nootka;
 
-import org.qtproject.qt5.android.QtNative;
+import org.qtproject.qt.android.QtNative;
+import org.qtproject.qt.android.bindings.QtActivity;
 import android.content.Context;
 import android.media.AudioManager;
 
diff --git a/src/android/src/net/sf/nootka/TshareExam.java b/src/Java-TODO/TshareExam.java
similarity index 95%
rename from src/android/src/net/sf/nootka/TshareExam.java
rename to src/Java-TODO/TshareExam.java
index ae99db9e3acce83ebef6290ddf40adc53747f449..200b17f2a2d9e45274d5ce4b2d41bc502636abe2 100644
--- a/src/android/src/net/sf/nootka/TshareExam.java
+++ b/src/Java-TODO/TshareExam.java
@@ -18,7 +18,7 @@
 
 package net.sf.nootka;
 
-import org.qtproject.qt5.android.QtNative;
+import org.qtproject.qt.android.QtNative;
 import java.lang.String;
 import android.content.Intent;
 import java.io.File;
@@ -33,7 +33,8 @@ import android.os.Build.VERSION_CODES;
  * There is appropriate information to use it during buid process in
  * src/android/build.gradle
  */
-import android.support.v4.content.FileProvider;
+// import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 
 public class TshareExam extends Activity
diff --git a/src/android/src/net/sf/nootka/Ttoast.java b/src/Java-TODO/Ttoast.java
similarity index 97%
rename from src/android/src/net/sf/nootka/Ttoast.java
rename to src/Java-TODO/Ttoast.java
index 8f19b031926c82fa018d139b42acfa5d4bd0bee9..3ab8f47cec34f9599773e9e16bce7b659fb9b6f5 100644
--- a/src/android/src/net/sf/nootka/Ttoast.java
+++ b/src/Java-TODO/Ttoast.java
@@ -18,7 +18,7 @@
 
 package net.sf.nootka;
 
-import org.qtproject.qt5.android.QtNative;
+import org.qtproject.qt.android.QtNative;
 import java.lang.String;
 import android.widget.Toast;