diff --git a/.gitlab-ci-files/job-android.yml b/.gitlab-ci-files/job-android.yml
index 6531a46..78b7eb9 100644
--- a/.gitlab-ci-files/job-android.yml
+++ b/.gitlab-ci-files/job-android.yml
@@ -7,41 +7,41 @@
job-android-hello-world:
extends: .job-android
script:
- - cd android/kotlin/HelloWorld/
+ - cd android/kotlin/0-HelloWorld/
- ./gradlew assembleRelease
job-android-account:
extends: .job-android
script:
- - cd android/kotlin/AccountLogin/
+ - cd android/kotlin/1-AccountLogin/
- ./gradlew assembleRelease
job-android-push-notifications:
extends: .job-android
script:
- - cd android/kotlin/Pushnotifications/
+ - cd android/kotlin/2-PushNotifications/
- ./gradlew assembleRelease
job-android-basic-chat:
extends: .job-android
script:
- - cd android/kotlin/BasicChat/
+ - cd android/kotlin/5-BasicChat/
- ./gradlew assembleRelease
job-android-advanced-chat:
extends: .job-android
script:
- - cd android/kotlin/AdvancedChat/
+ - cd android/kotlin/6-AdvancedChat/
- ./gradlew assembleRelease
job-android-incoming-call:
extends: .job-android
script:
- - cd android/kotlin/IncomingCall/
+ - cd android/kotlin/3-IncomingCall/
- ./gradlew assembleRelease
job-android-outgoing-call:
extends: .job-android
script:
- - cd android/kotlin/OutgoingCall/
+ - cd android/kotlin/4-OutgoingCall/
- ./gradlew assembleRelease
\ No newline at end of file
diff --git a/android/kotlin/AccountLogin/.gitignore b/android/kotlin/0-HelloWorld/.gitignore
similarity index 100%
rename from android/kotlin/AccountLogin/.gitignore
rename to android/kotlin/0-HelloWorld/.gitignore
diff --git a/android/kotlin/AccountLogin/.idea/$CACHE_FILE$ b/android/kotlin/0-HelloWorld/.idea/$CACHE_FILE$
similarity index 100%
rename from android/kotlin/AccountLogin/.idea/$CACHE_FILE$
rename to android/kotlin/0-HelloWorld/.idea/$CACHE_FILE$
diff --git a/android/kotlin/AccountLogin/.idea/.gitignore b/android/kotlin/0-HelloWorld/.idea/.gitignore
similarity index 100%
rename from android/kotlin/AccountLogin/.idea/.gitignore
rename to android/kotlin/0-HelloWorld/.idea/.gitignore
diff --git a/android/kotlin/HelloWorld/.idea/.name b/android/kotlin/0-HelloWorld/.idea/.name
similarity index 100%
rename from android/kotlin/HelloWorld/.idea/.name
rename to android/kotlin/0-HelloWorld/.idea/.name
diff --git a/android/kotlin/0-HelloWorld/.idea/codeStyles/Project.xml b/android/kotlin/0-HelloWorld/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..7643783
--- /dev/null
+++ b/android/kotlin/0-HelloWorld/.idea/codeStyles/Project.xml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/kotlin/0-HelloWorld/.idea/codeStyles/codeStyleConfig.xml b/android/kotlin/0-HelloWorld/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/android/kotlin/0-HelloWorld/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/android/kotlin/AccountLogin/.idea/compiler.xml b/android/kotlin/0-HelloWorld/.idea/compiler.xml
similarity index 100%
rename from android/kotlin/AccountLogin/.idea/compiler.xml
rename to android/kotlin/0-HelloWorld/.idea/compiler.xml
diff --git a/android/kotlin/0-HelloWorld/.idea/deploymentTargetDropDown.xml b/android/kotlin/0-HelloWorld/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..da29eb5
--- /dev/null
+++ b/android/kotlin/0-HelloWorld/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/kotlin/AccountLogin/.idea/gradle.xml b/android/kotlin/0-HelloWorld/.idea/gradle.xml
similarity index 100%
rename from android/kotlin/AccountLogin/.idea/gradle.xml
rename to android/kotlin/0-HelloWorld/.idea/gradle.xml
diff --git a/android/kotlin/AccountLogin/.idea/jarRepositories.xml b/android/kotlin/0-HelloWorld/.idea/jarRepositories.xml
similarity index 100%
rename from android/kotlin/AccountLogin/.idea/jarRepositories.xml
rename to android/kotlin/0-HelloWorld/.idea/jarRepositories.xml
diff --git a/android/kotlin/AccountLogin/.idea/misc.xml b/android/kotlin/0-HelloWorld/.idea/misc.xml
similarity index 100%
rename from android/kotlin/AccountLogin/.idea/misc.xml
rename to android/kotlin/0-HelloWorld/.idea/misc.xml
diff --git a/android/kotlin/AccountLogin/.idea/vcs.xml b/android/kotlin/0-HelloWorld/.idea/vcs.xml
similarity index 100%
rename from android/kotlin/AccountLogin/.idea/vcs.xml
rename to android/kotlin/0-HelloWorld/.idea/vcs.xml
diff --git a/android/kotlin/AccountLogin/app/.gitignore b/android/kotlin/0-HelloWorld/app/.gitignore
similarity index 100%
rename from android/kotlin/AccountLogin/app/.gitignore
rename to android/kotlin/0-HelloWorld/app/.gitignore
diff --git a/android/kotlin/HelloWorld/app/build.gradle b/android/kotlin/0-HelloWorld/app/build.gradle
similarity index 100%
rename from android/kotlin/HelloWorld/app/build.gradle
rename to android/kotlin/0-HelloWorld/app/build.gradle
diff --git a/android/kotlin/AccountLogin/app/proguard-rules.pro b/android/kotlin/0-HelloWorld/app/proguard-rules.pro
similarity index 100%
rename from android/kotlin/AccountLogin/app/proguard-rules.pro
rename to android/kotlin/0-HelloWorld/app/proguard-rules.pro
diff --git a/android/kotlin/HelloWorld/app/src/main/AndroidManifest.xml b/android/kotlin/0-HelloWorld/app/src/main/AndroidManifest.xml
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/AndroidManifest.xml
rename to android/kotlin/0-HelloWorld/app/src/main/AndroidManifest.xml
diff --git a/android/kotlin/HelloWorld/app/src/main/java/org/linphone/helloworld/HelloWorldActivity.kt b/android/kotlin/0-HelloWorld/app/src/main/java/org/linphone/helloworld/HelloWorldActivity.kt
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/java/org/linphone/helloworld/HelloWorldActivity.kt
rename to android/kotlin/0-HelloWorld/app/src/main/java/org/linphone/helloworld/HelloWorldActivity.kt
diff --git a/android/kotlin/AccountLogin/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/kotlin/0-HelloWorld/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to android/kotlin/0-HelloWorld/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/android/kotlin/AccountLogin/app/src/main/res/drawable/ic_launcher_background.xml b/android/kotlin/0-HelloWorld/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/drawable/ic_launcher_background.xml
rename to android/kotlin/0-HelloWorld/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/android/kotlin/HelloWorld/app/src/main/res/layout/hello_world_activity.xml b/android/kotlin/0-HelloWorld/app/src/main/res/layout/hello_world_activity.xml
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/layout/hello_world_activity.xml
rename to android/kotlin/0-HelloWorld/app/src/main/res/layout/hello_world_activity.xml
diff --git a/android/kotlin/AccountLogin/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/kotlin/0-HelloWorld/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to android/kotlin/0-HelloWorld/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/kotlin/AccountLogin/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/kotlin/0-HelloWorld/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to android/kotlin/0-HelloWorld/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/android/kotlin/AccountLogin/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/kotlin/0-HelloWorld/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to android/kotlin/0-HelloWorld/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/kotlin/AccountLogin/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/kotlin/0-HelloWorld/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to android/kotlin/0-HelloWorld/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/kotlin/AccountLogin/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/kotlin/0-HelloWorld/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to android/kotlin/0-HelloWorld/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/kotlin/AccountLogin/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/kotlin/0-HelloWorld/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to android/kotlin/0-HelloWorld/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/kotlin/AccountLogin/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/kotlin/0-HelloWorld/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to android/kotlin/0-HelloWorld/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/kotlin/AccountLogin/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/kotlin/0-HelloWorld/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to android/kotlin/0-HelloWorld/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/kotlin/AccountLogin/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/kotlin/0-HelloWorld/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to android/kotlin/0-HelloWorld/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/kotlin/AccountLogin/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/kotlin/0-HelloWorld/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to android/kotlin/0-HelloWorld/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/AccountLogin/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/kotlin/0-HelloWorld/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to android/kotlin/0-HelloWorld/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/kotlin/AccountLogin/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/kotlin/0-HelloWorld/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to android/kotlin/0-HelloWorld/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/HelloWorld/app/src/main/res/values-night/themes.xml b/android/kotlin/0-HelloWorld/app/src/main/res/values-night/themes.xml
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/values-night/themes.xml
rename to android/kotlin/0-HelloWorld/app/src/main/res/values-night/themes.xml
diff --git a/android/kotlin/AccountLogin/app/src/main/res/values/colors.xml b/android/kotlin/0-HelloWorld/app/src/main/res/values/colors.xml
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/values/colors.xml
rename to android/kotlin/0-HelloWorld/app/src/main/res/values/colors.xml
diff --git a/android/kotlin/HelloWorld/app/src/main/res/values/strings.xml b/android/kotlin/0-HelloWorld/app/src/main/res/values/strings.xml
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/values/strings.xml
rename to android/kotlin/0-HelloWorld/app/src/main/res/values/strings.xml
diff --git a/android/kotlin/HelloWorld/app/src/main/res/values/themes.xml b/android/kotlin/0-HelloWorld/app/src/main/res/values/themes.xml
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/values/themes.xml
rename to android/kotlin/0-HelloWorld/app/src/main/res/values/themes.xml
diff --git a/android/kotlin/AccountLogin/build.gradle b/android/kotlin/0-HelloWorld/build.gradle
similarity index 100%
rename from android/kotlin/AccountLogin/build.gradle
rename to android/kotlin/0-HelloWorld/build.gradle
diff --git a/android/kotlin/AccountLogin/gradle.properties b/android/kotlin/0-HelloWorld/gradle.properties
similarity index 100%
rename from android/kotlin/AccountLogin/gradle.properties
rename to android/kotlin/0-HelloWorld/gradle.properties
diff --git a/android/kotlin/AccountLogin/gradle/wrapper/gradle-wrapper.jar b/android/kotlin/0-HelloWorld/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/kotlin/AccountLogin/gradle/wrapper/gradle-wrapper.jar
rename to android/kotlin/0-HelloWorld/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/kotlin/HelloWorld/gradle/wrapper/gradle-wrapper.properties b/android/kotlin/0-HelloWorld/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/kotlin/HelloWorld/gradle/wrapper/gradle-wrapper.properties
rename to android/kotlin/0-HelloWorld/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/kotlin/AccountLogin/gradlew b/android/kotlin/0-HelloWorld/gradlew
similarity index 100%
rename from android/kotlin/AccountLogin/gradlew
rename to android/kotlin/0-HelloWorld/gradlew
diff --git a/android/kotlin/AccountLogin/gradlew.bat b/android/kotlin/0-HelloWorld/gradlew.bat
similarity index 100%
rename from android/kotlin/AccountLogin/gradlew.bat
rename to android/kotlin/0-HelloWorld/gradlew.bat
diff --git a/android/kotlin/HelloWorld/settings.gradle b/android/kotlin/0-HelloWorld/settings.gradle
similarity index 100%
rename from android/kotlin/HelloWorld/settings.gradle
rename to android/kotlin/0-HelloWorld/settings.gradle
diff --git a/android/kotlin/AdvancedChat/.gitignore b/android/kotlin/1-AccountLogin/.gitignore
similarity index 100%
rename from android/kotlin/AdvancedChat/.gitignore
rename to android/kotlin/1-AccountLogin/.gitignore
diff --git a/android/kotlin/AdvancedChat/.idea/$CACHE_FILE$ b/android/kotlin/1-AccountLogin/.idea/$CACHE_FILE$
similarity index 100%
rename from android/kotlin/AdvancedChat/.idea/$CACHE_FILE$
rename to android/kotlin/1-AccountLogin/.idea/$CACHE_FILE$
diff --git a/android/kotlin/AdvancedChat/.idea/.gitignore b/android/kotlin/1-AccountLogin/.idea/.gitignore
similarity index 100%
rename from android/kotlin/AdvancedChat/.idea/.gitignore
rename to android/kotlin/1-AccountLogin/.idea/.gitignore
diff --git a/android/kotlin/AccountLogin/.idea/.name b/android/kotlin/1-AccountLogin/.idea/.name
similarity index 100%
rename from android/kotlin/AccountLogin/.idea/.name
rename to android/kotlin/1-AccountLogin/.idea/.name
diff --git a/android/kotlin/AdvancedChat/.idea/compiler.xml b/android/kotlin/1-AccountLogin/.idea/compiler.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/.idea/compiler.xml
rename to android/kotlin/1-AccountLogin/.idea/compiler.xml
diff --git a/android/kotlin/AdvancedChat/.idea/gradle.xml b/android/kotlin/1-AccountLogin/.idea/gradle.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/.idea/gradle.xml
rename to android/kotlin/1-AccountLogin/.idea/gradle.xml
diff --git a/android/kotlin/AdvancedChat/.idea/jarRepositories.xml b/android/kotlin/1-AccountLogin/.idea/jarRepositories.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/.idea/jarRepositories.xml
rename to android/kotlin/1-AccountLogin/.idea/jarRepositories.xml
diff --git a/android/kotlin/AdvancedChat/.idea/misc.xml b/android/kotlin/1-AccountLogin/.idea/misc.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/.idea/misc.xml
rename to android/kotlin/1-AccountLogin/.idea/misc.xml
diff --git a/android/kotlin/AdvancedChat/.idea/vcs.xml b/android/kotlin/1-AccountLogin/.idea/vcs.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/.idea/vcs.xml
rename to android/kotlin/1-AccountLogin/.idea/vcs.xml
diff --git a/android/kotlin/AdvancedChat/app/.gitignore b/android/kotlin/1-AccountLogin/app/.gitignore
similarity index 100%
rename from android/kotlin/AdvancedChat/app/.gitignore
rename to android/kotlin/1-AccountLogin/app/.gitignore
diff --git a/android/kotlin/AccountLogin/app/build.gradle b/android/kotlin/1-AccountLogin/app/build.gradle
similarity index 100%
rename from android/kotlin/AccountLogin/app/build.gradle
rename to android/kotlin/1-AccountLogin/app/build.gradle
diff --git a/android/kotlin/AdvancedChat/app/proguard-rules.pro b/android/kotlin/1-AccountLogin/app/proguard-rules.pro
similarity index 100%
rename from android/kotlin/AdvancedChat/app/proguard-rules.pro
rename to android/kotlin/1-AccountLogin/app/proguard-rules.pro
diff --git a/android/kotlin/AccountLogin/app/src/main/AndroidManifest.xml b/android/kotlin/1-AccountLogin/app/src/main/AndroidManifest.xml
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/AndroidManifest.xml
rename to android/kotlin/1-AccountLogin/app/src/main/AndroidManifest.xml
diff --git a/android/kotlin/AccountLogin/app/src/main/java/org/linphone/accountlogin/AccountLoginActivity.kt b/android/kotlin/1-AccountLogin/app/src/main/java/org/linphone/accountlogin/AccountLoginActivity.kt
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/java/org/linphone/accountlogin/AccountLoginActivity.kt
rename to android/kotlin/1-AccountLogin/app/src/main/java/org/linphone/accountlogin/AccountLoginActivity.kt
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/kotlin/1-AccountLogin/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to android/kotlin/1-AccountLogin/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/drawable/ic_launcher_background.xml b/android/kotlin/1-AccountLogin/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/drawable/ic_launcher_background.xml
rename to android/kotlin/1-AccountLogin/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/android/kotlin/AccountLogin/app/src/main/res/layout/account_login_activity.xml b/android/kotlin/1-AccountLogin/app/src/main/res/layout/account_login_activity.xml
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/layout/account_login_activity.xml
rename to android/kotlin/1-AccountLogin/app/src/main/res/layout/account_login_activity.xml
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/kotlin/1-AccountLogin/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to android/kotlin/1-AccountLogin/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/kotlin/1-AccountLogin/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to android/kotlin/1-AccountLogin/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/kotlin/1-AccountLogin/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to android/kotlin/1-AccountLogin/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/kotlin/1-AccountLogin/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to android/kotlin/1-AccountLogin/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/kotlin/1-AccountLogin/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to android/kotlin/1-AccountLogin/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/kotlin/1-AccountLogin/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to android/kotlin/1-AccountLogin/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/kotlin/1-AccountLogin/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to android/kotlin/1-AccountLogin/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/kotlin/1-AccountLogin/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to android/kotlin/1-AccountLogin/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/kotlin/1-AccountLogin/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to android/kotlin/1-AccountLogin/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/kotlin/1-AccountLogin/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to android/kotlin/1-AccountLogin/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/kotlin/1-AccountLogin/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to android/kotlin/1-AccountLogin/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/kotlin/1-AccountLogin/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to android/kotlin/1-AccountLogin/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/AccountLogin/app/src/main/res/values-night/themes.xml b/android/kotlin/1-AccountLogin/app/src/main/res/values-night/themes.xml
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/values-night/themes.xml
rename to android/kotlin/1-AccountLogin/app/src/main/res/values-night/themes.xml
diff --git a/android/kotlin/HelloWorld/app/src/main/res/values/colors.xml b/android/kotlin/1-AccountLogin/app/src/main/res/values/colors.xml
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/values/colors.xml
rename to android/kotlin/1-AccountLogin/app/src/main/res/values/colors.xml
diff --git a/android/kotlin/AccountLogin/app/src/main/res/values/strings.xml b/android/kotlin/1-AccountLogin/app/src/main/res/values/strings.xml
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/values/strings.xml
rename to android/kotlin/1-AccountLogin/app/src/main/res/values/strings.xml
diff --git a/android/kotlin/AccountLogin/app/src/main/res/values/themes.xml b/android/kotlin/1-AccountLogin/app/src/main/res/values/themes.xml
similarity index 100%
rename from android/kotlin/AccountLogin/app/src/main/res/values/themes.xml
rename to android/kotlin/1-AccountLogin/app/src/main/res/values/themes.xml
diff --git a/android/kotlin/AdvancedChat/build.gradle b/android/kotlin/1-AccountLogin/build.gradle
similarity index 100%
rename from android/kotlin/AdvancedChat/build.gradle
rename to android/kotlin/1-AccountLogin/build.gradle
diff --git a/android/kotlin/AdvancedChat/gradle.properties b/android/kotlin/1-AccountLogin/gradle.properties
similarity index 100%
rename from android/kotlin/AdvancedChat/gradle.properties
rename to android/kotlin/1-AccountLogin/gradle.properties
diff --git a/android/kotlin/AdvancedChat/gradle/wrapper/gradle-wrapper.jar b/android/kotlin/1-AccountLogin/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/kotlin/AdvancedChat/gradle/wrapper/gradle-wrapper.jar
rename to android/kotlin/1-AccountLogin/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/kotlin/AccountLogin/gradle/wrapper/gradle-wrapper.properties b/android/kotlin/1-AccountLogin/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/kotlin/AccountLogin/gradle/wrapper/gradle-wrapper.properties
rename to android/kotlin/1-AccountLogin/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/kotlin/AdvancedChat/gradlew b/android/kotlin/1-AccountLogin/gradlew
similarity index 100%
rename from android/kotlin/AdvancedChat/gradlew
rename to android/kotlin/1-AccountLogin/gradlew
diff --git a/android/kotlin/AdvancedChat/gradlew.bat b/android/kotlin/1-AccountLogin/gradlew.bat
similarity index 100%
rename from android/kotlin/AdvancedChat/gradlew.bat
rename to android/kotlin/1-AccountLogin/gradlew.bat
diff --git a/android/kotlin/AccountLogin/settings.gradle b/android/kotlin/1-AccountLogin/settings.gradle
similarity index 100%
rename from android/kotlin/AccountLogin/settings.gradle
rename to android/kotlin/1-AccountLogin/settings.gradle
diff --git a/android/kotlin/BasicChat/.gitignore b/android/kotlin/2-PushNotifications/.gitignore
similarity index 100%
rename from android/kotlin/BasicChat/.gitignore
rename to android/kotlin/2-PushNotifications/.gitignore
diff --git a/android/kotlin/BasicChat/.idea/$CACHE_FILE$ b/android/kotlin/2-PushNotifications/.idea/$CACHE_FILE$
similarity index 100%
rename from android/kotlin/BasicChat/.idea/$CACHE_FILE$
rename to android/kotlin/2-PushNotifications/.idea/$CACHE_FILE$
diff --git a/android/kotlin/HelloWorld/.idea/.gitignore b/android/kotlin/2-PushNotifications/.idea/.gitignore
similarity index 100%
rename from android/kotlin/HelloWorld/.idea/.gitignore
rename to android/kotlin/2-PushNotifications/.idea/.gitignore
diff --git a/android/kotlin/Pushnotifications/.idea/.name b/android/kotlin/2-PushNotifications/.idea/.name
similarity index 100%
rename from android/kotlin/Pushnotifications/.idea/.name
rename to android/kotlin/2-PushNotifications/.idea/.name
diff --git a/android/kotlin/BasicChat/.idea/compiler.xml b/android/kotlin/2-PushNotifications/.idea/compiler.xml
similarity index 100%
rename from android/kotlin/BasicChat/.idea/compiler.xml
rename to android/kotlin/2-PushNotifications/.idea/compiler.xml
diff --git a/android/kotlin/BasicChat/.idea/gradle.xml b/android/kotlin/2-PushNotifications/.idea/gradle.xml
similarity index 100%
rename from android/kotlin/BasicChat/.idea/gradle.xml
rename to android/kotlin/2-PushNotifications/.idea/gradle.xml
diff --git a/android/kotlin/BasicChat/.idea/jarRepositories.xml b/android/kotlin/2-PushNotifications/.idea/jarRepositories.xml
similarity index 100%
rename from android/kotlin/BasicChat/.idea/jarRepositories.xml
rename to android/kotlin/2-PushNotifications/.idea/jarRepositories.xml
diff --git a/android/kotlin/BasicChat/.idea/misc.xml b/android/kotlin/2-PushNotifications/.idea/misc.xml
similarity index 100%
rename from android/kotlin/BasicChat/.idea/misc.xml
rename to android/kotlin/2-PushNotifications/.idea/misc.xml
diff --git a/android/kotlin/BasicChat/.idea/vcs.xml b/android/kotlin/2-PushNotifications/.idea/vcs.xml
similarity index 100%
rename from android/kotlin/BasicChat/.idea/vcs.xml
rename to android/kotlin/2-PushNotifications/.idea/vcs.xml
diff --git a/android/kotlin/BasicChat/app/.gitignore b/android/kotlin/2-PushNotifications/app/.gitignore
similarity index 100%
rename from android/kotlin/BasicChat/app/.gitignore
rename to android/kotlin/2-PushNotifications/app/.gitignore
diff --git a/android/kotlin/Pushnotifications/app/build.gradle b/android/kotlin/2-PushNotifications/app/build.gradle
similarity index 100%
rename from android/kotlin/Pushnotifications/app/build.gradle
rename to android/kotlin/2-PushNotifications/app/build.gradle
diff --git a/android/kotlin/Pushnotifications/app/google-services.json b/android/kotlin/2-PushNotifications/app/google-services.json
similarity index 100%
rename from android/kotlin/Pushnotifications/app/google-services.json
rename to android/kotlin/2-PushNotifications/app/google-services.json
diff --git a/android/kotlin/BasicChat/app/proguard-rules.pro b/android/kotlin/2-PushNotifications/app/proguard-rules.pro
similarity index 100%
rename from android/kotlin/BasicChat/app/proguard-rules.pro
rename to android/kotlin/2-PushNotifications/app/proguard-rules.pro
diff --git a/android/kotlin/Pushnotifications/app/src/main/AndroidManifest.xml b/android/kotlin/2-PushNotifications/app/src/main/AndroidManifest.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/AndroidManifest.xml
rename to android/kotlin/2-PushNotifications/app/src/main/AndroidManifest.xml
diff --git a/android/kotlin/Pushnotifications/app/src/main/java/org/linphone/pushnotifications/PushBroadcastReceiver.kt b/android/kotlin/2-PushNotifications/app/src/main/java/org/linphone/pushnotifications/PushBroadcastReceiver.kt
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/java/org/linphone/pushnotifications/PushBroadcastReceiver.kt
rename to android/kotlin/2-PushNotifications/app/src/main/java/org/linphone/pushnotifications/PushBroadcastReceiver.kt
diff --git a/android/kotlin/Pushnotifications/app/src/main/java/org/linphone/pushnotifications/PushNotificationsActivity.kt b/android/kotlin/2-PushNotifications/app/src/main/java/org/linphone/pushnotifications/PushNotificationsActivity.kt
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/java/org/linphone/pushnotifications/PushNotificationsActivity.kt
rename to android/kotlin/2-PushNotifications/app/src/main/java/org/linphone/pushnotifications/PushNotificationsActivity.kt
diff --git a/android/kotlin/BasicChat/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/kotlin/2-PushNotifications/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to android/kotlin/2-PushNotifications/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/android/kotlin/BasicChat/app/src/main/res/drawable/ic_launcher_background.xml b/android/kotlin/2-PushNotifications/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/drawable/ic_launcher_background.xml
rename to android/kotlin/2-PushNotifications/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/layout/push_notifications_activity.xml b/android/kotlin/2-PushNotifications/app/src/main/res/layout/push_notifications_activity.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/layout/push_notifications_activity.xml
rename to android/kotlin/2-PushNotifications/app/src/main/res/layout/push_notifications_activity.xml
diff --git a/android/kotlin/BasicChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/kotlin/2-PushNotifications/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to android/kotlin/2-PushNotifications/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/kotlin/BasicChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/kotlin/2-PushNotifications/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to android/kotlin/2-PushNotifications/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/android/kotlin/BasicChat/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/kotlin/2-PushNotifications/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to android/kotlin/2-PushNotifications/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/kotlin/BasicChat/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/kotlin/2-PushNotifications/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to android/kotlin/2-PushNotifications/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/kotlin/BasicChat/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/kotlin/2-PushNotifications/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to android/kotlin/2-PushNotifications/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/kotlin/BasicChat/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/kotlin/2-PushNotifications/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to android/kotlin/2-PushNotifications/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/kotlin/BasicChat/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/kotlin/2-PushNotifications/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to android/kotlin/2-PushNotifications/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/kotlin/BasicChat/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/kotlin/2-PushNotifications/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to android/kotlin/2-PushNotifications/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/kotlin/BasicChat/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/kotlin/2-PushNotifications/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to android/kotlin/2-PushNotifications/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/kotlin/BasicChat/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/kotlin/2-PushNotifications/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to android/kotlin/2-PushNotifications/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/BasicChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/kotlin/2-PushNotifications/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to android/kotlin/2-PushNotifications/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/kotlin/BasicChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/kotlin/2-PushNotifications/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to android/kotlin/2-PushNotifications/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/values-night/themes.xml b/android/kotlin/2-PushNotifications/app/src/main/res/values-night/themes.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/values-night/themes.xml
rename to android/kotlin/2-PushNotifications/app/src/main/res/values-night/themes.xml
diff --git a/android/kotlin/IncomingCall/app/src/main/res/values/colors.xml b/android/kotlin/2-PushNotifications/app/src/main/res/values/colors.xml
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/values/colors.xml
rename to android/kotlin/2-PushNotifications/app/src/main/res/values/colors.xml
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/values/strings.xml b/android/kotlin/2-PushNotifications/app/src/main/res/values/strings.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/values/strings.xml
rename to android/kotlin/2-PushNotifications/app/src/main/res/values/strings.xml
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/values/themes.xml b/android/kotlin/2-PushNotifications/app/src/main/res/values/themes.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/values/themes.xml
rename to android/kotlin/2-PushNotifications/app/src/main/res/values/themes.xml
diff --git a/android/kotlin/Pushnotifications/build.gradle b/android/kotlin/2-PushNotifications/build.gradle
similarity index 100%
rename from android/kotlin/Pushnotifications/build.gradle
rename to android/kotlin/2-PushNotifications/build.gradle
diff --git a/android/kotlin/BasicChat/gradle.properties b/android/kotlin/2-PushNotifications/gradle.properties
similarity index 100%
rename from android/kotlin/BasicChat/gradle.properties
rename to android/kotlin/2-PushNotifications/gradle.properties
diff --git a/android/kotlin/BasicChat/gradle/wrapper/gradle-wrapper.jar b/android/kotlin/2-PushNotifications/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/kotlin/BasicChat/gradle/wrapper/gradle-wrapper.jar
rename to android/kotlin/2-PushNotifications/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/kotlin/Pushnotifications/gradle/wrapper/gradle-wrapper.properties b/android/kotlin/2-PushNotifications/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/kotlin/Pushnotifications/gradle/wrapper/gradle-wrapper.properties
rename to android/kotlin/2-PushNotifications/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/kotlin/BasicChat/gradlew b/android/kotlin/2-PushNotifications/gradlew
similarity index 100%
rename from android/kotlin/BasicChat/gradlew
rename to android/kotlin/2-PushNotifications/gradlew
diff --git a/android/kotlin/BasicChat/gradlew.bat b/android/kotlin/2-PushNotifications/gradlew.bat
similarity index 100%
rename from android/kotlin/BasicChat/gradlew.bat
rename to android/kotlin/2-PushNotifications/gradlew.bat
diff --git a/android/kotlin/Pushnotifications/settings.gradle b/android/kotlin/2-PushNotifications/settings.gradle
similarity index 100%
rename from android/kotlin/Pushnotifications/settings.gradle
rename to android/kotlin/2-PushNotifications/settings.gradle
diff --git a/android/kotlin/HelloWorld/.gitignore b/android/kotlin/3-IncomingCall/.gitignore
similarity index 100%
rename from android/kotlin/HelloWorld/.gitignore
rename to android/kotlin/3-IncomingCall/.gitignore
diff --git a/android/kotlin/HelloWorld/.idea/$CACHE_FILE$ b/android/kotlin/3-IncomingCall/.idea/$CACHE_FILE$
similarity index 100%
rename from android/kotlin/HelloWorld/.idea/$CACHE_FILE$
rename to android/kotlin/3-IncomingCall/.idea/$CACHE_FILE$
diff --git a/android/kotlin/IncomingCall/.idea/.gitignore b/android/kotlin/3-IncomingCall/.idea/.gitignore
similarity index 100%
rename from android/kotlin/IncomingCall/.idea/.gitignore
rename to android/kotlin/3-IncomingCall/.idea/.gitignore
diff --git a/android/kotlin/IncomingCall/.idea/.name b/android/kotlin/3-IncomingCall/.idea/.name
similarity index 100%
rename from android/kotlin/IncomingCall/.idea/.name
rename to android/kotlin/3-IncomingCall/.idea/.name
diff --git a/android/kotlin/HelloWorld/.idea/compiler.xml b/android/kotlin/3-IncomingCall/.idea/compiler.xml
similarity index 100%
rename from android/kotlin/HelloWorld/.idea/compiler.xml
rename to android/kotlin/3-IncomingCall/.idea/compiler.xml
diff --git a/android/kotlin/HelloWorld/.idea/gradle.xml b/android/kotlin/3-IncomingCall/.idea/gradle.xml
similarity index 100%
rename from android/kotlin/HelloWorld/.idea/gradle.xml
rename to android/kotlin/3-IncomingCall/.idea/gradle.xml
diff --git a/android/kotlin/HelloWorld/.idea/jarRepositories.xml b/android/kotlin/3-IncomingCall/.idea/jarRepositories.xml
similarity index 100%
rename from android/kotlin/HelloWorld/.idea/jarRepositories.xml
rename to android/kotlin/3-IncomingCall/.idea/jarRepositories.xml
diff --git a/android/kotlin/HelloWorld/.idea/misc.xml b/android/kotlin/3-IncomingCall/.idea/misc.xml
similarity index 100%
rename from android/kotlin/HelloWorld/.idea/misc.xml
rename to android/kotlin/3-IncomingCall/.idea/misc.xml
diff --git a/android/kotlin/HelloWorld/.idea/vcs.xml b/android/kotlin/3-IncomingCall/.idea/vcs.xml
similarity index 100%
rename from android/kotlin/HelloWorld/.idea/vcs.xml
rename to android/kotlin/3-IncomingCall/.idea/vcs.xml
diff --git a/android/kotlin/HelloWorld/app/.gitignore b/android/kotlin/3-IncomingCall/app/.gitignore
similarity index 100%
rename from android/kotlin/HelloWorld/app/.gitignore
rename to android/kotlin/3-IncomingCall/app/.gitignore
diff --git a/android/kotlin/IncomingCall/app/build.gradle b/android/kotlin/3-IncomingCall/app/build.gradle
similarity index 100%
rename from android/kotlin/IncomingCall/app/build.gradle
rename to android/kotlin/3-IncomingCall/app/build.gradle
diff --git a/android/kotlin/HelloWorld/app/proguard-rules.pro b/android/kotlin/3-IncomingCall/app/proguard-rules.pro
similarity index 100%
rename from android/kotlin/HelloWorld/app/proguard-rules.pro
rename to android/kotlin/3-IncomingCall/app/proguard-rules.pro
diff --git a/android/kotlin/IncomingCall/app/src/main/AndroidManifest.xml b/android/kotlin/3-IncomingCall/app/src/main/AndroidManifest.xml
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/AndroidManifest.xml
rename to android/kotlin/3-IncomingCall/app/src/main/AndroidManifest.xml
diff --git a/android/kotlin/IncomingCall/app/src/main/java/org/linphone/incomingcall/IncomingCallActivity.kt b/android/kotlin/3-IncomingCall/app/src/main/java/org/linphone/incomingcall/IncomingCallActivity.kt
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/java/org/linphone/incomingcall/IncomingCallActivity.kt
rename to android/kotlin/3-IncomingCall/app/src/main/java/org/linphone/incomingcall/IncomingCallActivity.kt
diff --git a/android/kotlin/HelloWorld/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/kotlin/3-IncomingCall/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to android/kotlin/3-IncomingCall/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/android/kotlin/HelloWorld/app/src/main/res/drawable/ic_launcher_background.xml b/android/kotlin/3-IncomingCall/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/drawable/ic_launcher_background.xml
rename to android/kotlin/3-IncomingCall/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/android/kotlin/IncomingCall/app/src/main/res/layout/incoming_call_activity.xml b/android/kotlin/3-IncomingCall/app/src/main/res/layout/incoming_call_activity.xml
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/layout/incoming_call_activity.xml
rename to android/kotlin/3-IncomingCall/app/src/main/res/layout/incoming_call_activity.xml
diff --git a/android/kotlin/HelloWorld/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/kotlin/3-IncomingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to android/kotlin/3-IncomingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/kotlin/HelloWorld/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/kotlin/3-IncomingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to android/kotlin/3-IncomingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/android/kotlin/HelloWorld/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/kotlin/3-IncomingCall/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to android/kotlin/3-IncomingCall/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/kotlin/HelloWorld/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/kotlin/3-IncomingCall/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to android/kotlin/3-IncomingCall/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/kotlin/HelloWorld/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/kotlin/3-IncomingCall/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to android/kotlin/3-IncomingCall/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/kotlin/HelloWorld/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/kotlin/3-IncomingCall/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to android/kotlin/3-IncomingCall/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/kotlin/HelloWorld/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/kotlin/3-IncomingCall/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to android/kotlin/3-IncomingCall/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/kotlin/HelloWorld/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/kotlin/3-IncomingCall/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to android/kotlin/3-IncomingCall/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/kotlin/HelloWorld/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/kotlin/3-IncomingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to android/kotlin/3-IncomingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/kotlin/HelloWorld/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/kotlin/3-IncomingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to android/kotlin/3-IncomingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/HelloWorld/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/kotlin/3-IncomingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to android/kotlin/3-IncomingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/kotlin/HelloWorld/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/kotlin/3-IncomingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/HelloWorld/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to android/kotlin/3-IncomingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/IncomingCall/app/src/main/res/values-night/themes.xml b/android/kotlin/3-IncomingCall/app/src/main/res/values-night/themes.xml
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/values-night/themes.xml
rename to android/kotlin/3-IncomingCall/app/src/main/res/values-night/themes.xml
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/values/colors.xml b/android/kotlin/3-IncomingCall/app/src/main/res/values/colors.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/values/colors.xml
rename to android/kotlin/3-IncomingCall/app/src/main/res/values/colors.xml
diff --git a/android/kotlin/IncomingCall/app/src/main/res/values/strings.xml b/android/kotlin/3-IncomingCall/app/src/main/res/values/strings.xml
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/values/strings.xml
rename to android/kotlin/3-IncomingCall/app/src/main/res/values/strings.xml
diff --git a/android/kotlin/IncomingCall/app/src/main/res/values/themes.xml b/android/kotlin/3-IncomingCall/app/src/main/res/values/themes.xml
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/values/themes.xml
rename to android/kotlin/3-IncomingCall/app/src/main/res/values/themes.xml
diff --git a/android/kotlin/IncomingCall/build.gradle b/android/kotlin/3-IncomingCall/build.gradle
similarity index 100%
rename from android/kotlin/IncomingCall/build.gradle
rename to android/kotlin/3-IncomingCall/build.gradle
diff --git a/android/kotlin/HelloWorld/gradle.properties b/android/kotlin/3-IncomingCall/gradle.properties
similarity index 100%
rename from android/kotlin/HelloWorld/gradle.properties
rename to android/kotlin/3-IncomingCall/gradle.properties
diff --git a/android/kotlin/HelloWorld/gradle/wrapper/gradle-wrapper.jar b/android/kotlin/3-IncomingCall/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/kotlin/HelloWorld/gradle/wrapper/gradle-wrapper.jar
rename to android/kotlin/3-IncomingCall/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/kotlin/IncomingCall/gradle/wrapper/gradle-wrapper.properties b/android/kotlin/3-IncomingCall/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/kotlin/IncomingCall/gradle/wrapper/gradle-wrapper.properties
rename to android/kotlin/3-IncomingCall/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/kotlin/HelloWorld/gradlew b/android/kotlin/3-IncomingCall/gradlew
similarity index 100%
rename from android/kotlin/HelloWorld/gradlew
rename to android/kotlin/3-IncomingCall/gradlew
diff --git a/android/kotlin/HelloWorld/gradlew.bat b/android/kotlin/3-IncomingCall/gradlew.bat
similarity index 100%
rename from android/kotlin/HelloWorld/gradlew.bat
rename to android/kotlin/3-IncomingCall/gradlew.bat
diff --git a/android/kotlin/IncomingCall/settings.gradle b/android/kotlin/3-IncomingCall/settings.gradle
similarity index 100%
rename from android/kotlin/IncomingCall/settings.gradle
rename to android/kotlin/3-IncomingCall/settings.gradle
diff --git a/android/kotlin/IncomingCall/.gitignore b/android/kotlin/4-OutgoingCall/.gitignore
similarity index 100%
rename from android/kotlin/IncomingCall/.gitignore
rename to android/kotlin/4-OutgoingCall/.gitignore
diff --git a/android/kotlin/IncomingCall/.idea/$CACHE_FILE$ b/android/kotlin/4-OutgoingCall/.idea/$CACHE_FILE$
similarity index 100%
rename from android/kotlin/IncomingCall/.idea/$CACHE_FILE$
rename to android/kotlin/4-OutgoingCall/.idea/$CACHE_FILE$
diff --git a/android/kotlin/OutgoingCall/.idea/.gitignore b/android/kotlin/4-OutgoingCall/.idea/.gitignore
similarity index 100%
rename from android/kotlin/OutgoingCall/.idea/.gitignore
rename to android/kotlin/4-OutgoingCall/.idea/.gitignore
diff --git a/android/kotlin/OutgoingCall/.idea/.name b/android/kotlin/4-OutgoingCall/.idea/.name
similarity index 100%
rename from android/kotlin/OutgoingCall/.idea/.name
rename to android/kotlin/4-OutgoingCall/.idea/.name
diff --git a/android/kotlin/IncomingCall/.idea/compiler.xml b/android/kotlin/4-OutgoingCall/.idea/compiler.xml
similarity index 100%
rename from android/kotlin/IncomingCall/.idea/compiler.xml
rename to android/kotlin/4-OutgoingCall/.idea/compiler.xml
diff --git a/android/kotlin/OutgoingCall/.idea/gradle.xml b/android/kotlin/4-OutgoingCall/.idea/gradle.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/.idea/gradle.xml
rename to android/kotlin/4-OutgoingCall/.idea/gradle.xml
diff --git a/android/kotlin/IncomingCall/.idea/jarRepositories.xml b/android/kotlin/4-OutgoingCall/.idea/jarRepositories.xml
similarity index 100%
rename from android/kotlin/IncomingCall/.idea/jarRepositories.xml
rename to android/kotlin/4-OutgoingCall/.idea/jarRepositories.xml
diff --git a/android/kotlin/IncomingCall/.idea/misc.xml b/android/kotlin/4-OutgoingCall/.idea/misc.xml
similarity index 100%
rename from android/kotlin/IncomingCall/.idea/misc.xml
rename to android/kotlin/4-OutgoingCall/.idea/misc.xml
diff --git a/android/kotlin/IncomingCall/.idea/vcs.xml b/android/kotlin/4-OutgoingCall/.idea/vcs.xml
similarity index 100%
rename from android/kotlin/IncomingCall/.idea/vcs.xml
rename to android/kotlin/4-OutgoingCall/.idea/vcs.xml
diff --git a/android/kotlin/IncomingCall/app/.gitignore b/android/kotlin/4-OutgoingCall/app/.gitignore
similarity index 100%
rename from android/kotlin/IncomingCall/app/.gitignore
rename to android/kotlin/4-OutgoingCall/app/.gitignore
diff --git a/android/kotlin/OutgoingCall/app/build.gradle b/android/kotlin/4-OutgoingCall/app/build.gradle
similarity index 100%
rename from android/kotlin/OutgoingCall/app/build.gradle
rename to android/kotlin/4-OutgoingCall/app/build.gradle
diff --git a/android/kotlin/IncomingCall/app/proguard-rules.pro b/android/kotlin/4-OutgoingCall/app/proguard-rules.pro
similarity index 100%
rename from android/kotlin/IncomingCall/app/proguard-rules.pro
rename to android/kotlin/4-OutgoingCall/app/proguard-rules.pro
diff --git a/android/kotlin/OutgoingCall/app/src/main/AndroidManifest.xml b/android/kotlin/4-OutgoingCall/app/src/main/AndroidManifest.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/AndroidManifest.xml
rename to android/kotlin/4-OutgoingCall/app/src/main/AndroidManifest.xml
diff --git a/android/kotlin/OutgoingCall/app/src/main/java/org/linphone/outgoingcall/OutgoingCallActivity.kt b/android/kotlin/4-OutgoingCall/app/src/main/java/org/linphone/outgoingcall/OutgoingCallActivity.kt
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/java/org/linphone/outgoingcall/OutgoingCallActivity.kt
rename to android/kotlin/4-OutgoingCall/app/src/main/java/org/linphone/outgoingcall/OutgoingCallActivity.kt
diff --git a/android/kotlin/IncomingCall/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/kotlin/4-OutgoingCall/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to android/kotlin/4-OutgoingCall/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/android/kotlin/IncomingCall/app/src/main/res/drawable/ic_launcher_background.xml b/android/kotlin/4-OutgoingCall/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/drawable/ic_launcher_background.xml
rename to android/kotlin/4-OutgoingCall/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/layout/outgoing_call_activity.xml b/android/kotlin/4-OutgoingCall/app/src/main/res/layout/outgoing_call_activity.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/layout/outgoing_call_activity.xml
rename to android/kotlin/4-OutgoingCall/app/src/main/res/layout/outgoing_call_activity.xml
diff --git a/android/kotlin/IncomingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/kotlin/IncomingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/android/kotlin/IncomingCall/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/kotlin/IncomingCall/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/kotlin/IncomingCall/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/kotlin/IncomingCall/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/kotlin/IncomingCall/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/kotlin/IncomingCall/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/kotlin/IncomingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/kotlin/IncomingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/IncomingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/kotlin/IncomingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/IncomingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to android/kotlin/4-OutgoingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/values-night/themes.xml b/android/kotlin/4-OutgoingCall/app/src/main/res/values-night/themes.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/values-night/themes.xml
rename to android/kotlin/4-OutgoingCall/app/src/main/res/values-night/themes.xml
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/values/colors.xml b/android/kotlin/4-OutgoingCall/app/src/main/res/values/colors.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/values/colors.xml
rename to android/kotlin/4-OutgoingCall/app/src/main/res/values/colors.xml
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/values/strings.xml b/android/kotlin/4-OutgoingCall/app/src/main/res/values/strings.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/values/strings.xml
rename to android/kotlin/4-OutgoingCall/app/src/main/res/values/strings.xml
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/values/themes.xml b/android/kotlin/4-OutgoingCall/app/src/main/res/values/themes.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/values/themes.xml
rename to android/kotlin/4-OutgoingCall/app/src/main/res/values/themes.xml
diff --git a/android/kotlin/BasicChat/build.gradle b/android/kotlin/4-OutgoingCall/build.gradle
similarity index 100%
rename from android/kotlin/BasicChat/build.gradle
rename to android/kotlin/4-OutgoingCall/build.gradle
diff --git a/android/kotlin/IncomingCall/gradle.properties b/android/kotlin/4-OutgoingCall/gradle.properties
similarity index 100%
rename from android/kotlin/IncomingCall/gradle.properties
rename to android/kotlin/4-OutgoingCall/gradle.properties
diff --git a/android/kotlin/IncomingCall/gradle/wrapper/gradle-wrapper.jar b/android/kotlin/4-OutgoingCall/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/kotlin/IncomingCall/gradle/wrapper/gradle-wrapper.jar
rename to android/kotlin/4-OutgoingCall/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/kotlin/OutgoingCall/gradle/wrapper/gradle-wrapper.properties b/android/kotlin/4-OutgoingCall/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/kotlin/OutgoingCall/gradle/wrapper/gradle-wrapper.properties
rename to android/kotlin/4-OutgoingCall/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/kotlin/IncomingCall/gradlew b/android/kotlin/4-OutgoingCall/gradlew
similarity index 100%
rename from android/kotlin/IncomingCall/gradlew
rename to android/kotlin/4-OutgoingCall/gradlew
diff --git a/android/kotlin/IncomingCall/gradlew.bat b/android/kotlin/4-OutgoingCall/gradlew.bat
similarity index 100%
rename from android/kotlin/IncomingCall/gradlew.bat
rename to android/kotlin/4-OutgoingCall/gradlew.bat
diff --git a/android/kotlin/OutgoingCall/settings.gradle b/android/kotlin/4-OutgoingCall/settings.gradle
similarity index 100%
rename from android/kotlin/OutgoingCall/settings.gradle
rename to android/kotlin/4-OutgoingCall/settings.gradle
diff --git a/android/kotlin/OutgoingCall/.gitignore b/android/kotlin/5-BasicChat/.gitignore
similarity index 100%
rename from android/kotlin/OutgoingCall/.gitignore
rename to android/kotlin/5-BasicChat/.gitignore
diff --git a/android/kotlin/OutgoingCall/.idea/$CACHE_FILE$ b/android/kotlin/5-BasicChat/.idea/$CACHE_FILE$
similarity index 100%
rename from android/kotlin/OutgoingCall/.idea/$CACHE_FILE$
rename to android/kotlin/5-BasicChat/.idea/$CACHE_FILE$
diff --git a/android/kotlin/BasicChat/.idea/.name b/android/kotlin/5-BasicChat/.idea/.name
similarity index 100%
rename from android/kotlin/BasicChat/.idea/.name
rename to android/kotlin/5-BasicChat/.idea/.name
diff --git a/android/kotlin/OutgoingCall/.idea/compiler.xml b/android/kotlin/5-BasicChat/.idea/compiler.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/.idea/compiler.xml
rename to android/kotlin/5-BasicChat/.idea/compiler.xml
diff --git a/android/kotlin/IncomingCall/.idea/gradle.xml b/android/kotlin/5-BasicChat/.idea/gradle.xml
similarity index 100%
rename from android/kotlin/IncomingCall/.idea/gradle.xml
rename to android/kotlin/5-BasicChat/.idea/gradle.xml
diff --git a/android/kotlin/OutgoingCall/.idea/jarRepositories.xml b/android/kotlin/5-BasicChat/.idea/jarRepositories.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/.idea/jarRepositories.xml
rename to android/kotlin/5-BasicChat/.idea/jarRepositories.xml
diff --git a/android/kotlin/OutgoingCall/.idea/misc.xml b/android/kotlin/5-BasicChat/.idea/misc.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/.idea/misc.xml
rename to android/kotlin/5-BasicChat/.idea/misc.xml
diff --git a/android/kotlin/OutgoingCall/.idea/vcs.xml b/android/kotlin/5-BasicChat/.idea/vcs.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/.idea/vcs.xml
rename to android/kotlin/5-BasicChat/.idea/vcs.xml
diff --git a/android/kotlin/OutgoingCall/app/.gitignore b/android/kotlin/5-BasicChat/app/.gitignore
similarity index 100%
rename from android/kotlin/OutgoingCall/app/.gitignore
rename to android/kotlin/5-BasicChat/app/.gitignore
diff --git a/android/kotlin/BasicChat/app/build.gradle b/android/kotlin/5-BasicChat/app/build.gradle
similarity index 100%
rename from android/kotlin/BasicChat/app/build.gradle
rename to android/kotlin/5-BasicChat/app/build.gradle
diff --git a/android/kotlin/OutgoingCall/app/proguard-rules.pro b/android/kotlin/5-BasicChat/app/proguard-rules.pro
similarity index 100%
rename from android/kotlin/OutgoingCall/app/proguard-rules.pro
rename to android/kotlin/5-BasicChat/app/proguard-rules.pro
diff --git a/android/kotlin/BasicChat/app/src/main/AndroidManifest.xml b/android/kotlin/5-BasicChat/app/src/main/AndroidManifest.xml
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/AndroidManifest.xml
rename to android/kotlin/5-BasicChat/app/src/main/AndroidManifest.xml
diff --git a/android/kotlin/BasicChat/app/src/main/assets/belledonne.png b/android/kotlin/5-BasicChat/app/src/main/assets/belledonne.png
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/assets/belledonne.png
rename to android/kotlin/5-BasicChat/app/src/main/assets/belledonne.png
diff --git a/android/kotlin/BasicChat/app/src/main/java/org/linphone/basicchat/BasicChatActivity.kt b/android/kotlin/5-BasicChat/app/src/main/java/org/linphone/basicchat/BasicChatActivity.kt
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/java/org/linphone/basicchat/BasicChatActivity.kt
rename to android/kotlin/5-BasicChat/app/src/main/java/org/linphone/basicchat/BasicChatActivity.kt
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/kotlin/5-BasicChat/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to android/kotlin/5-BasicChat/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/drawable/ic_launcher_background.xml b/android/kotlin/5-BasicChat/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/drawable/ic_launcher_background.xml
rename to android/kotlin/5-BasicChat/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/android/kotlin/BasicChat/app/src/main/res/layout/basic_chat_activity.xml b/android/kotlin/5-BasicChat/app/src/main/res/layout/basic_chat_activity.xml
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/layout/basic_chat_activity.xml
rename to android/kotlin/5-BasicChat/app/src/main/res/layout/basic_chat_activity.xml
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/kotlin/5-BasicChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to android/kotlin/5-BasicChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/kotlin/5-BasicChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to android/kotlin/5-BasicChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/kotlin/5-BasicChat/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to android/kotlin/5-BasicChat/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/kotlin/5-BasicChat/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to android/kotlin/5-BasicChat/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/kotlin/5-BasicChat/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to android/kotlin/5-BasicChat/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/kotlin/5-BasicChat/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to android/kotlin/5-BasicChat/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/kotlin/5-BasicChat/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to android/kotlin/5-BasicChat/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/kotlin/5-BasicChat/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to android/kotlin/5-BasicChat/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/kotlin/5-BasicChat/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to android/kotlin/5-BasicChat/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/kotlin/5-BasicChat/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to android/kotlin/5-BasicChat/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/kotlin/5-BasicChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to android/kotlin/5-BasicChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/kotlin/OutgoingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/kotlin/5-BasicChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/OutgoingCall/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to android/kotlin/5-BasicChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/BasicChat/app/src/main/res/values-night/themes.xml b/android/kotlin/5-BasicChat/app/src/main/res/values-night/themes.xml
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/values-night/themes.xml
rename to android/kotlin/5-BasicChat/app/src/main/res/values-night/themes.xml
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/values/colors.xml b/android/kotlin/5-BasicChat/app/src/main/res/values/colors.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/values/colors.xml
rename to android/kotlin/5-BasicChat/app/src/main/res/values/colors.xml
diff --git a/android/kotlin/BasicChat/app/src/main/res/values/strings.xml b/android/kotlin/5-BasicChat/app/src/main/res/values/strings.xml
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/values/strings.xml
rename to android/kotlin/5-BasicChat/app/src/main/res/values/strings.xml
diff --git a/android/kotlin/BasicChat/app/src/main/res/values/themes.xml b/android/kotlin/5-BasicChat/app/src/main/res/values/themes.xml
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/values/themes.xml
rename to android/kotlin/5-BasicChat/app/src/main/res/values/themes.xml
diff --git a/android/kotlin/HelloWorld/build.gradle b/android/kotlin/5-BasicChat/build.gradle
similarity index 100%
rename from android/kotlin/HelloWorld/build.gradle
rename to android/kotlin/5-BasicChat/build.gradle
diff --git a/android/kotlin/OutgoingCall/gradle.properties b/android/kotlin/5-BasicChat/gradle.properties
similarity index 100%
rename from android/kotlin/OutgoingCall/gradle.properties
rename to android/kotlin/5-BasicChat/gradle.properties
diff --git a/android/kotlin/OutgoingCall/gradle/wrapper/gradle-wrapper.jar b/android/kotlin/5-BasicChat/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/kotlin/OutgoingCall/gradle/wrapper/gradle-wrapper.jar
rename to android/kotlin/5-BasicChat/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/kotlin/BasicChat/gradle/wrapper/gradle-wrapper.properties b/android/kotlin/5-BasicChat/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/kotlin/BasicChat/gradle/wrapper/gradle-wrapper.properties
rename to android/kotlin/5-BasicChat/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/kotlin/OutgoingCall/gradlew b/android/kotlin/5-BasicChat/gradlew
similarity index 100%
rename from android/kotlin/OutgoingCall/gradlew
rename to android/kotlin/5-BasicChat/gradlew
diff --git a/android/kotlin/OutgoingCall/gradlew.bat b/android/kotlin/5-BasicChat/gradlew.bat
similarity index 100%
rename from android/kotlin/OutgoingCall/gradlew.bat
rename to android/kotlin/5-BasicChat/gradlew.bat
diff --git a/android/kotlin/BasicChat/settings.gradle b/android/kotlin/5-BasicChat/settings.gradle
similarity index 100%
rename from android/kotlin/BasicChat/settings.gradle
rename to android/kotlin/5-BasicChat/settings.gradle
diff --git a/android/kotlin/Pushnotifications/.gitignore b/android/kotlin/6-AdvancedChat/.gitignore
similarity index 100%
rename from android/kotlin/Pushnotifications/.gitignore
rename to android/kotlin/6-AdvancedChat/.gitignore
diff --git a/android/kotlin/Pushnotifications/.idea/$CACHE_FILE$ b/android/kotlin/6-AdvancedChat/.idea/$CACHE_FILE$
similarity index 100%
rename from android/kotlin/Pushnotifications/.idea/$CACHE_FILE$
rename to android/kotlin/6-AdvancedChat/.idea/$CACHE_FILE$
diff --git a/android/kotlin/Pushnotifications/.idea/.gitignore b/android/kotlin/6-AdvancedChat/.idea/.gitignore
similarity index 100%
rename from android/kotlin/Pushnotifications/.idea/.gitignore
rename to android/kotlin/6-AdvancedChat/.idea/.gitignore
diff --git a/android/kotlin/AdvancedChat/.idea/.name b/android/kotlin/6-AdvancedChat/.idea/.name
similarity index 100%
rename from android/kotlin/AdvancedChat/.idea/.name
rename to android/kotlin/6-AdvancedChat/.idea/.name
diff --git a/android/kotlin/Pushnotifications/.idea/compiler.xml b/android/kotlin/6-AdvancedChat/.idea/compiler.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/.idea/compiler.xml
rename to android/kotlin/6-AdvancedChat/.idea/compiler.xml
diff --git a/android/kotlin/Pushnotifications/.idea/gradle.xml b/android/kotlin/6-AdvancedChat/.idea/gradle.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/.idea/gradle.xml
rename to android/kotlin/6-AdvancedChat/.idea/gradle.xml
diff --git a/android/kotlin/Pushnotifications/.idea/jarRepositories.xml b/android/kotlin/6-AdvancedChat/.idea/jarRepositories.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/.idea/jarRepositories.xml
rename to android/kotlin/6-AdvancedChat/.idea/jarRepositories.xml
diff --git a/android/kotlin/Pushnotifications/.idea/misc.xml b/android/kotlin/6-AdvancedChat/.idea/misc.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/.idea/misc.xml
rename to android/kotlin/6-AdvancedChat/.idea/misc.xml
diff --git a/android/kotlin/Pushnotifications/.idea/vcs.xml b/android/kotlin/6-AdvancedChat/.idea/vcs.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/.idea/vcs.xml
rename to android/kotlin/6-AdvancedChat/.idea/vcs.xml
diff --git a/android/kotlin/Pushnotifications/app/.gitignore b/android/kotlin/6-AdvancedChat/app/.gitignore
similarity index 100%
rename from android/kotlin/Pushnotifications/app/.gitignore
rename to android/kotlin/6-AdvancedChat/app/.gitignore
diff --git a/android/kotlin/AdvancedChat/app/build.gradle b/android/kotlin/6-AdvancedChat/app/build.gradle
similarity index 100%
rename from android/kotlin/AdvancedChat/app/build.gradle
rename to android/kotlin/6-AdvancedChat/app/build.gradle
diff --git a/android/kotlin/Pushnotifications/app/proguard-rules.pro b/android/kotlin/6-AdvancedChat/app/proguard-rules.pro
similarity index 100%
rename from android/kotlin/Pushnotifications/app/proguard-rules.pro
rename to android/kotlin/6-AdvancedChat/app/proguard-rules.pro
diff --git a/android/kotlin/AdvancedChat/app/src/main/AndroidManifest.xml b/android/kotlin/6-AdvancedChat/app/src/main/AndroidManifest.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/AndroidManifest.xml
rename to android/kotlin/6-AdvancedChat/app/src/main/AndroidManifest.xml
diff --git a/android/kotlin/AdvancedChat/app/src/main/java/org/linphone/advancedchat/AdvancedChatActivity.kt b/android/kotlin/6-AdvancedChat/app/src/main/java/org/linphone/advancedchat/AdvancedChatActivity.kt
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/java/org/linphone/advancedchat/AdvancedChatActivity.kt
rename to android/kotlin/6-AdvancedChat/app/src/main/java/org/linphone/advancedchat/AdvancedChatActivity.kt
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/kotlin/6-AdvancedChat/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to android/kotlin/6-AdvancedChat/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/drawable/ic_launcher_background.xml b/android/kotlin/6-AdvancedChat/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/drawable/ic_launcher_background.xml
rename to android/kotlin/6-AdvancedChat/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/layout/advanced_chat_activity.xml b/android/kotlin/6-AdvancedChat/app/src/main/res/layout/advanced_chat_activity.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/layout/advanced_chat_activity.xml
rename to android/kotlin/6-AdvancedChat/app/src/main/res/layout/advanced_chat_activity.xml
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/kotlin/Pushnotifications/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/kotlin/Pushnotifications/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to android/kotlin/6-AdvancedChat/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/values-night/themes.xml b/android/kotlin/6-AdvancedChat/app/src/main/res/values-night/themes.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/values-night/themes.xml
rename to android/kotlin/6-AdvancedChat/app/src/main/res/values-night/themes.xml
diff --git a/android/kotlin/BasicChat/app/src/main/res/values/colors.xml b/android/kotlin/6-AdvancedChat/app/src/main/res/values/colors.xml
similarity index 100%
rename from android/kotlin/BasicChat/app/src/main/res/values/colors.xml
rename to android/kotlin/6-AdvancedChat/app/src/main/res/values/colors.xml
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/values/strings.xml b/android/kotlin/6-AdvancedChat/app/src/main/res/values/strings.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/values/strings.xml
rename to android/kotlin/6-AdvancedChat/app/src/main/res/values/strings.xml
diff --git a/android/kotlin/AdvancedChat/app/src/main/res/values/themes.xml b/android/kotlin/6-AdvancedChat/app/src/main/res/values/themes.xml
similarity index 100%
rename from android/kotlin/AdvancedChat/app/src/main/res/values/themes.xml
rename to android/kotlin/6-AdvancedChat/app/src/main/res/values/themes.xml
diff --git a/android/kotlin/OutgoingCall/build.gradle b/android/kotlin/6-AdvancedChat/build.gradle
similarity index 100%
rename from android/kotlin/OutgoingCall/build.gradle
rename to android/kotlin/6-AdvancedChat/build.gradle
diff --git a/android/kotlin/Pushnotifications/gradle.properties b/android/kotlin/6-AdvancedChat/gradle.properties
similarity index 100%
rename from android/kotlin/Pushnotifications/gradle.properties
rename to android/kotlin/6-AdvancedChat/gradle.properties
diff --git a/android/kotlin/Pushnotifications/gradle/wrapper/gradle-wrapper.jar b/android/kotlin/6-AdvancedChat/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/kotlin/Pushnotifications/gradle/wrapper/gradle-wrapper.jar
rename to android/kotlin/6-AdvancedChat/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/kotlin/AdvancedChat/gradle/wrapper/gradle-wrapper.properties b/android/kotlin/6-AdvancedChat/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/kotlin/AdvancedChat/gradle/wrapper/gradle-wrapper.properties
rename to android/kotlin/6-AdvancedChat/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/kotlin/Pushnotifications/gradlew b/android/kotlin/6-AdvancedChat/gradlew
similarity index 100%
rename from android/kotlin/Pushnotifications/gradlew
rename to android/kotlin/6-AdvancedChat/gradlew
diff --git a/android/kotlin/Pushnotifications/gradlew.bat b/android/kotlin/6-AdvancedChat/gradlew.bat
similarity index 100%
rename from android/kotlin/Pushnotifications/gradlew.bat
rename to android/kotlin/6-AdvancedChat/gradlew.bat
diff --git a/android/kotlin/AdvancedChat/settings.gradle b/android/kotlin/6-AdvancedChat/settings.gradle
similarity index 100%
rename from android/kotlin/AdvancedChat/settings.gradle
rename to android/kotlin/6-AdvancedChat/settings.gradle