diff --git a/.gitignore b/.gitignore
index eb9d115ee..afccd0b7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@ google-services.json
 gradle.properties
 .*clang*
 linphone.iml
+src/linphone-wrapper
diff --git a/build.gradle b/build.gradle
index 5e5b3cc8d..95a5a8b28 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,8 +57,7 @@ if (firebaseEnable()) {
 }
 
 //// Submodule Dir /////
-def submoduleDir = ['submodules/mediastreamer2/java/src',
-                    'liblinphone-sdk/android-arm64/share/linphonej/java/']
+def submoduleDir = ['submodules/mediastreamer2/java/src']
 ////////////////////////
 
 ///// Exclude Files /////
@@ -116,7 +115,7 @@ android {
     main {
       manifest.srcFile 'AndroidManifest.xml'
       def srcDirs = submoduleDir
-      srcDirs.addAll(['src/android'])
+      srcDirs.addAll(['src/linphone-wrapper', 'src/android'])
       java.srcDirs = srcDirs
       resources.srcDirs = srcDirs
       aidl.srcDirs = srcDirs
diff --git a/libLinphoneAndroidSdk.gradle b/libLinphoneAndroidSdk.gradle
index 28b28f2f7..1f21b0069 100644
--- a/libLinphoneAndroidSdk.gradle
+++ b/libLinphoneAndroidSdk.gradle
@@ -32,12 +32,7 @@ dependencies {
     javadocDeps group: 'org.apache.commons', name: 'commons-compress', version: '+'
 }
 
-def submoduleDir = ['submodules/mediastreamer2/java/src',
-                    'submodules/linphone/java/j2se',
-                    'submodules/linphone/java/common',
-                    'submodules/linphone/java/impl',
-                    'submodules/linphone/coreapi/help/examples/java']
-
+def srcDir = ['submodules/mediastreamer2/java/src', 'src/linphone-wrapper']
 
 def excludePackage = []
 
@@ -63,10 +58,10 @@ android {
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifestLibrary.xml'
-            java.srcDirs = submoduleDir
-            resources.srcDirs = submoduleDir
-            aidl.srcDirs = submoduleDir
-            renderscript.srcDirs = submoduleDir
+            java.srcDirs = srcDir
+            resources.srcDirs = srcDir
+            aidl.srcDirs = srcDir
+            renderscript.srcDirs = srcDir
             jniLibs.srcDirs = ['libs']
 
             java.excludes = ['**/mediastream/MediastreamerActivity.java']
@@ -84,7 +79,7 @@ android {
 ///////////// Task /////////////
 
 task(releaseJavadoc, type: Javadoc, dependsOn: "assembleRelease") {
-    source = submoduleDir
+    source = ['submodules/mediastreamer2/java/src', 'src/linphone-wrapper/org/linphone/core']
     excludes = ['**/mediastream/MediastreamerActivity.java',
                 '**/**.html',
                 '**/**.aidl']
diff --git a/linphoneAndroidSdk.gradle b/linphoneAndroidSdk.gradle
index c699b2c4a..0aedb70c7 100644
--- a/linphoneAndroidSdk.gradle
+++ b/linphoneAndroidSdk.gradle
@@ -47,12 +47,7 @@ if (firebaseEnable()) {
 }
 
 
-def srcDirs = ['submodules/mediastreamer2/java/src',
-                    'submodules/linphone/java/j2se',
-                    'submodules/linphone/java/common',
-                    'submodules/linphone/java/impl',
-                    'submodules/linphone/coreapi/help/examples/java',
-                    'src/android']
+def srcDirs = ['submodules/mediastreamer2/java/src', 'src/linphone-wrapper', 'src/android']
 
 def excludeFiles = []
 // Exclude firebase file if not enable
@@ -111,11 +106,7 @@ android {
 ///////////// Task /////////////
 
 task(releaseJavadoc, type: Javadoc, dependsOn: "assembleRelease") {
-    source = ['submodules/mediastreamer2/java/src',
-              'submodules/linphone/java/j2se',
-              'submodules/linphone/java/common',
-              'submodules/linphone/java/impl',
-              'submodules/linphone/coreapi/help/java']
+    source = ['submodules/mediastreamer2/java/src', 'src/linphone-wrapper']
     excludes = ['**/mediastream/MediastreamerActivity.java',
                 '**/**.html',
                 '**/**.aidl']
diff --git a/prepare.py b/prepare.py
index 184b54730..2105492c6 100755
--- a/prepare.py
+++ b/prepare.py
@@ -228,7 +228,9 @@ $(TOPDIR)/res/raw/rootca.pem:
 copy-libs:
 \trm -rf libs-debug/armeabi
 \trm -rf libs/armeabi
+\trm -rf src/linphone-wrapper && mkdir -p src/linphone-wrapper/
 \tif test -d "liblinphone-sdk/android-arm"; then \\
+\t\tcp -R liblinphone-sdk/android-arm/share/linphonej/java/* src/linphone-wrapper/ && \\
 \t\tmkdir -p libs-debug/armeabi && \\
 \t\tcp -f liblinphone-sdk/android-arm/lib/lib*.so libs-debug/armeabi && \\
 \t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs-debug/armeabi && \\
@@ -246,6 +248,7 @@ copy-libs:
 \trm -rf libs-debug/armeabi-v7a
 \trm -rf libs/armeabi-v7a
 \tif test -d "liblinphone-sdk/android-armv7"; then \\
+\t\tcp -R liblinphone-sdk/android-armv7/share/linphonej/java/* src/linphone-wrapper/ && \\
 \t\tmkdir -p libs-debug/armeabi-v7a && \\
 \t\tcp -f liblinphone-sdk/android-armv7/lib/lib*.so libs-debug/armeabi-v7a && \\
 \t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs-debug/armeabi-v7a && \\
@@ -263,6 +266,7 @@ copy-libs:
 \trm -rf libs-debug/arm64-v8a
 \trm -rf libs/arm64-v8a
 \tif test -d "liblinphone-sdk/android-arm64"; then \\
+\t\tcp -R liblinphone-sdk/android-arm64/share/linphonej/java/* src/linphone-wrapper && \\
 \t\tmkdir -p libs-debug/arm64-v8a && \\
 \t\tcp -f liblinphone-sdk/android-arm64/lib/lib*.so libs-debug/arm64-v8a && \\
 \t\tcp -f liblinphone-sdk/android-arm64/lib/mediastreamer/plugins/*.so libs-debug/arm64-v8a && \\
@@ -280,6 +284,7 @@ copy-libs:
 \trm -rf libs-debug/x86
 \trm -rf libs/x86
 \tif test -d "liblinphone-sdk/android-x86"; then \\
+\t\tcp -R liblinphone-sdk/android-x86/share/linphonej/java/* src/linphone-wrapper/ && \\
 \t\tmkdir -p libs-debug/x86 && \\
 \t\tcp -f liblinphone-sdk/android-x86/lib/lib*.so libs-debug/x86 && \\
 \t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs-debug/x86 && \\